From aa5b9b3edde1f2ef1ebd8543d493fbf0d2a2a3f4 Mon Sep 17 00:00:00 2001 From: weiyunlong Date: Sun, 9 Feb 2025 16:33:38 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=90=88=E5=90=8C=E6=AD=A3=E6=96=87(?= =?UTF-8?q?=E7=9B=96=E7=AB=A0=E4=BB=B6)=E4=B8=8D=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=202.=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit S --- .../repc/rebm/listplugin/PurDemandListPlugin.java | 2 ++ .../shkd/repc/recon/opplugin/ContractOPPlugin.java | 12 +++++++++++- .../java/shkd/todotask/ApprovalPageMobilePlugin.java | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) 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"); }