From 1feb4408372a5f269f64ed582681c109329bdcc4 Mon Sep 17 00:00:00 2001 From: zhangzhiguo Date: Mon, 13 Jan 2025 09:49:01 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcdev/fs/plugin/operate/DailyreimbursHomeCheckOp.java | 4 ++++ .../fs/plugin/operate/TripreimbursebillIsHomeCheckOp.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyreimbursHomeCheckOp.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyreimbursHomeCheckOp.java index 6ea2c3f..221f0d6 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyreimbursHomeCheckOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyreimbursHomeCheckOp.java @@ -83,6 +83,10 @@ public class DailyreimbursHomeCheckOp extends AbstractOperationServicePlugIn { "id,zcgj_month_times as monthTime", visitSetFilterArray, null ); + if(homeDataSet == null || homeDataSet.isEmpty()){ + String message = String.format("提交人没有往来居家配置。"); + this.addFatalErrorMessage(extendedDataEntity, message); + } int monthTime = 0; for (Row row : homeDataSet) { monthTime = row.getInteger("monthTime"); diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TripreimbursebillIsHomeCheckOp.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TripreimbursebillIsHomeCheckOp.java index c9b51c9..c7b4210 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TripreimbursebillIsHomeCheckOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/TripreimbursebillIsHomeCheckOp.java @@ -83,15 +83,20 @@ public class TripreimbursebillIsHomeCheckOp extends AbstractOperationServicePlug "id,zcgj_month_times as monthTime", visitSetFilterArray, null ); + if(homeDataSet == null || homeDataSet.isEmpty()){ + String message = String.format("提交人没有往来居家配置。"); + this.addFatalErrorMessage(extendedDataEntity, message); + } int monthTime = 0; for (Row row : homeDataSet) { monthTime = row.getInteger("monthTime"); } if(monthTime != 0){ DynamicObjectCollection tripentry = dataEntity.getDynamicObjectCollection("zcgj_homeentity");//oa流程分录 + boolean isOk=true; + Map homeentityCountMap = new HashMap<>(); int i = 1; - boolean isOk=true; for (DynamicObject dynamicObject : tripentry) { Date bxmonth = dynamicObject.getDate("zcgj_bxmonth"); String yearMonth = dateFormat.format(bxmonth);