diff --git a/main/java/shkd/repc/rebm/listplugin/PurDemandListPlugin.java b/main/java/shkd/repc/rebm/listplugin/PurDemandListPlugin.java index 137a96e..555b951 100644 --- a/main/java/shkd/repc/rebm/listplugin/PurDemandListPlugin.java +++ b/main/java/shkd/repc/rebm/listplugin/PurDemandListPlugin.java @@ -29,6 +29,8 @@ public class PurDemandListPlugin extends AbstractListPlugin { public void setFilter(SetFilterEvent e) { super.setFilter(e); + e.getQFilters().clear(); + IFormView parentView = this.getView().getParentView(); IDataModel model = parentView.getModel(); DynamicObject dataEntity = model.getDataEntity(); diff --git a/main/java/shkd/repc/recon/opplugin/ContractOPPlugin.java b/main/java/shkd/repc/recon/opplugin/ContractOPPlugin.java index 7b72a58..a97b72c 100644 --- a/main/java/shkd/repc/recon/opplugin/ContractOPPlugin.java +++ b/main/java/shkd/repc/recon/opplugin/ContractOPPlugin.java @@ -29,7 +29,7 @@ public class ContractOPPlugin extends AbstractOperationServicePlugIn { DynamicObject dataEntity = extendedDataEntity.getDataEntity(); DynamicObjectCollection qeugBondentrys = dataEntity.getDynamicObjectCollection("qeug_bondentry"); BigDecimal qeugMarginlevel = BigDecimal.ZERO; - if (qeugBondentrys.size() > 0) { + if (!qeugBondentrys.isEmpty()) { for (DynamicObject qeugBondentry : qeugBondentrys) { qeugMarginlevel = qeugMarginlevel.add(qeugBondentry.getBigDecimal("qeug_marginlevel")); } @@ -39,6 +39,16 @@ public class ContractOPPlugin extends AbstractOperationServicePlugIn { } } break; + case "qeug_attatchment": + for (ExtendedDataEntity extendedDataEntity : dataEntities1) { + //合同正文(盖章件)不能为空 + DynamicObject dataEntity = extendedDataEntity.getDataEntity(); + DynamicObjectCollection attachmentpanel = dataEntity.getDynamicObjectCollection("attachmentpanel"); + if (attachmentpanel.isEmpty()) { + this.addMessage(extendedDataEntity, "合同正文(盖章件)不能为空"); + } + } + break; default: break; diff --git a/main/java/shkd/todotask/ApprovalPageMobilePlugin.java b/main/java/shkd/todotask/ApprovalPageMobilePlugin.java index 30f4cd5..8774f73 100644 --- a/main/java/shkd/todotask/ApprovalPageMobilePlugin.java +++ b/main/java/shkd/todotask/ApprovalPageMobilePlugin.java @@ -24,6 +24,7 @@ public class ApprovalPageMobilePlugin extends ApprovalPageMobilePluginNew { String operation = (String) e.getReturnData(); if (!"cancel".equals(operation)){ logger.info("close1"); + this.getView().close(); logger.info("close2"); }