From 95c9ab67e49f8a21714576c05fcdff63062d41d9 Mon Sep 17 00:00:00 2001 From: weiyunlong Date: Mon, 21 Apr 2025 15:30:55 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BC=98=E5=8C=96=E8=B5=84=E9=87=91?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=A7=91=E7=9B=AE=E9=80=BB=E8=BE=91=20--s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/operate/PayApplySaveOperation.java | 17 ++++++++++++----- .../fi/plugin/operate/PayBillSaveOperation.java | 3 ++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayApplySaveOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayApplySaveOperation.java index efe93ef..72cc0e3 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayApplySaveOperation.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayApplySaveOperation.java @@ -142,13 +142,19 @@ public class PayApplySaveOperation extends AbstractOperationServicePlugIn implem //是否充值类 boolean shjhWhetherrechargecateg = bill.getBoolean("shjh_whetherrechargecateg"); - QFilter q2 = new QFilter("shjh_czl", QCP.equals, shjhWhetherrechargecateg); - qFilter = qFilter.and(q2); + if (shjhWhetherrechargecateg) { + QFilter q2 = new QFilter("shjh_czl", QCP.equals, shjhWhetherrechargecateg); + qFilter = qFilter.and(q2); + } + //是否自行采购 boolean shjhZxcg = bill.getBoolean("shjh_zxcg"); - QFilter q3 = new QFilter("shjh_zxcg", QCP.equals, shjhZxcg); - qFilter = qFilter.and(q3); + if (shjhZxcg) { + QFilter q3 = new QFilter("shjh_zxcg", QCP.equals, shjhZxcg); + qFilter = qFilter.and(q3); + } + //事业部_多选基础资料,通过申请单的二级部门去映射表查询(shjh_ejbm_syb) DynamicObject shjhSecondarydept = bill.getDynamicObject("shjh_secondarydept"); @@ -265,7 +271,8 @@ public class PayApplySaveOperation extends AbstractOperationServicePlugIn implem DynamicObject[] accounts = BusinessDataServiceHelper.load("shjh_request_account", "id,shjh_membersubject", qFilter.toArray()); if (accounts.length > 1) { // 根据生效日期,失效日期区间,判断当前时间满足的数据 - Date currentDate = new Date(); +// Date currentDate = new Date(); + Date currentDate = bill.getDate("applydate");//申请日期 QFilter startDateFilter = new QFilter("shjh_begindate", QCP.less_equals, currentDate); QFilter endDateFilter = new QFilter("shjh_enddate", QCP.large_equals, currentDate); QFilter newFilter = qFilter.and(startDateFilter).and(endDateFilter); diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java index 5a8cca3..abf0d9a 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/PayBillSaveOperation.java @@ -184,7 +184,8 @@ public class PayBillSaveOperation extends AbstractOperationServicePlugIn impleme DynamicObject[] accounts = BusinessDataServiceHelper.load("shjh_pay_account", "id,shjh_membersubject", qFilter.toArray()); if (accounts.length > 1) { // 根据生效日期,失效日期区间,判断当前时间满足的数据 - Date currentDate = new Date(); +// Date currentDate = new Date(); + Date currentDate = bill.getDate("bizdate");//业务日期 QFilter startDateFilter = new QFilter("shjh_begindate", QCP.less_equals, currentDate); QFilter endDateFilter = new QFilter("shjh_enddate", QCP.large_equals, currentDate); QFilter newFilter = qFilter.and(startDateFilter).and(endDateFilter);