From 8634e98e287ee0fb43d20a3ab4af8c127e21b611 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Thu, 4 Dec 2025 15:05:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=88=90=E6=9C=AC=E6=A0=B8?= =?UTF-8?q?=E7=AE=97=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8=E5=8F=96=E6=95=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcdev/pr/plugin/form/ContractCostSplitBillPluginExt.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractCostSplitBillPluginExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractCostSplitBillPluginExt.java index 2ac2522..bb43d6d 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractCostSplitBillPluginExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractCostSplitBillPluginExt.java @@ -621,13 +621,14 @@ public class ContractCostSplitBillPluginExt extends AbstractEccoBillPlugin imple DynamicObject period = (DynamicObject) this.getModel().getValue("period"); QFilter projectFilter = new QFilter("project", "=", project.getPkValue()); QFilter periodFilter = new QFilter("enddate", "<=", this.getLastTimeOfDay(period.getDate("enddate"))); + QFilter periodFilter2 = new QFilter("period.enddate", "<=", this.getLastTimeOfDay(period.getDate("enddate")));//二开添加 QFilter typeFilter = new QFilter("contattr.basictype", "!=", "02"); QFilter commonFilter = new QFilter("billstatus", "=", BillStatusEnum.AUDIT.getValue()); QFilter payDirectionFilter = new QFilter("paydirection", "=", PayDirectionEnum.OUT.getValue()); QFilter isInCostFilter = new QFilter("contract.isincost", "=", true); QFilter splitCompletedFilter = new QFilter("isincost", "=", "0"); Map onWayFilter = this.getOnWayFilter(); - DynamicObject[] settleBills = BusinessDataServiceHelper.load("ec_out_contract_settle", "id", new QFilter[]{projectFilter, periodFilter, commonFilter, payDirectionFilter, typeFilter, isInCostFilter, splitCompletedFilter, (QFilter) onWayFilter.get(SplitBillTypeEnum.SETTLE.getValue())}); + DynamicObject[] settleBills = BusinessDataServiceHelper.load("ec_out_contract_settle", "id", new QFilter[]{projectFilter, periodFilter, periodFilter2, commonFilter, payDirectionFilter, typeFilter, isInCostFilter, splitCompletedFilter, (QFilter) onWayFilter.get(SplitBillTypeEnum.SETTLE.getValue())}); Set splitMeasureIds = new HashSet(16); DynamicObjectCollection entries = this.getModel().getEntryEntity("entryentity"); DynamicObjectType entryDT = entries.getDynamicObjectType(); @@ -792,7 +793,7 @@ public class ContractCostSplitBillPluginExt extends AbstractEccoBillPlugin imple HashMap measureSplitedAmountMap = this.getHistorySplitAmount(true); QFilter splitMeasureFilter = new QFilter(OutContractMeasureConstant.ID_ENTITY_PK, "not in", splitMeasureIds); - QFilter[] measureFilters = new QFilter[]{projectFilter, periodFilter, commonFilter, payDirectionFilter, typeFilter, isInCostFilter, splitMeasureFilter, splitCompletedFilter, (QFilter) onWayFilter.get(SplitBillTypeEnum.MEASURE.getValue())}; + QFilter[] measureFilters = new QFilter[]{projectFilter, periodFilter,periodFilter2, commonFilter, payDirectionFilter, typeFilter, isInCostFilter, splitMeasureFilter, splitCompletedFilter, (QFilter) onWayFilter.get(SplitBillTypeEnum.MEASURE.getValue())}; DynamicObject[] measureBills = BusinessDataServiceHelper.load("ec_outcontractmeasure", "id", measureFilters); List noSettleMeasureBills = new ArrayList(); Map enterpriseCbsMap = this.getEnterpriseCbsMap();