diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/SubmitOccupyFilingApplication.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/SubmitOccupyFilingApplication.java index 75de396..46ded03 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/SubmitOccupyFilingApplication.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/SubmitOccupyFilingApplication.java @@ -8,7 +8,6 @@ import kd.bos.entity.plugin.PreparePropertysEventArgs; import kd.bos.entity.plugin.args.AfterOperationArgs; import kd.bos.entity.plugin.args.BeforeOperationArgs; import kd.bos.entity.plugin.args.BeginOperationTransactionArgs; -import kd.bos.entity.plugin.args.EndOperationTransactionArgs; import kd.bos.entity.validate.ErrorLevel; import kd.bos.logging.Log; import kd.bos.logging.LogFactory; @@ -55,6 +54,7 @@ public class SubmitOccupyFilingApplication extends AbstractOperationServicePlugI } logger.info("同步开始"); + String operationKey = e.getOperationKey();//unsubmit //用于接收成功的数据 ArrayList arrayList = new ArrayList(); DynamicObject[] dataEntities = e.getDataEntities(); @@ -63,7 +63,7 @@ public class SubmitOccupyFilingApplication extends AbstractOperationServicePlugI DynamicObject shkd_baed = dataEntity.getDynamicObject("shkd_baed"); if (shkd_baed!=null){ //提交前同步备案申请 - boolean res = UpdateFilingApplicationData(shkd_baed, dataEntity); + boolean res = UpdateFilingApplicationData(shkd_baed, dataEntity,operationKey); if (res){ arrayList.add(dataEntity); } @@ -73,7 +73,12 @@ public class SubmitOccupyFilingApplication extends AbstractOperationServicePlugI } } DynamicObject[] results = (DynamicObject[]) arrayList.toArray(new DynamicObject[arrayList.size()]); - e.setDataEntities(results); + if (results.length!=0){ + e.setDataEntities(results); + }else { + e.setDataEntities(results); + } + } @Override @@ -86,7 +91,7 @@ public class SubmitOccupyFilingApplication extends AbstractOperationServicePlugI super.afterExecuteOperationTransaction(e); } - public boolean UpdateFilingApplicationData(DynamicObject shkd_baed,DynamicObject dataEntity){ + public boolean UpdateFilingApplicationData(DynamicObject shkd_baed, DynamicObject dataEntity, String operationKey){ boolean res=true; QFilter qFilter = new QFilter("billstatus", QCP.in, Arrays.asList("B", "C"));//提交,审核状态 //提款处理(银行提款处理,债券发行) @@ -140,7 +145,19 @@ public class SubmitOccupyFilingApplication extends AbstractOperationServicePlugI List> hebinList=hebinLists(zqfxlist,rzzllist,kzcllist); String name = dataEntity.getDataEntityType().getName(); Map getdatamap=getdatamap(name,dataEntity); - hebinList.add(getdatamap); + if ("unsubmit".equals(operationKey)){ + for (int i = 0; i < hebinList.size(); i++) { + Map stringObjectMap = hebinList.get(i); + String shkd_djbh = (String) stringObjectMap.get("shkd_djbh"); + if (shkd_djbh.equals(getdatamap.get("shkd_djbh"))){ + hebinList.remove(i); + } + } + }else { + hebinList.add(getdatamap); + } + + // 使用Stream计算shkd_zyje的合计