From dd18b0daf57eafd5ec7882ddf22823007874e0a5 Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Mon, 8 Sep 2025 18:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E7=BB=93=E7=AE=97?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89=E5=B9=B6=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2-=20=E5=9C=A8=20IwsCostPushMapper.xml=20?=
=?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=20settlementType=20=E7=AD=9B?=
=?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=20-=20=E4=BC=98=E5=8C=96=20IwsCostP?=
=?UTF-8?q?ushServiceImpl=20=E4=B8=AD=E7=9A=84=E4=BB=A3=E7=A0=81=E6=A0=BC?=
=?UTF-8?q?=E5=BC=8F=20-=20=E7=AE=80=E5=8C=96=20SltAgreementInfoMapper.xml?=
=?UTF-8?q?=20=E4=B8=AD=E7=9A=84=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../push/service/impl/IwsCostPushServiceImpl.java | 3 ++-
.../mapper/material/push/IwsCostPushMapper.xml | 3 +++
.../material/settlement/SltAgreementInfoMapper.xml | 13 +++----------
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java
index 370d64dd..ac884bee 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/IwsCostPushServiceImpl.java
@@ -224,7 +224,8 @@ public class IwsCostPushServiceImpl implements IwsCostPushService {
// 获取已结算协议 ---- （安全工器具）的本月租赁区间费用明细
settlementSafetyEquipmentCostsDetails = sltAgreementInfoService.selectPeriodCostList(new PeriodCostQueryDto()
.setAgreementIds(safetySettlementAgreementList.stream().map(IwsCostPushBean::getAgreementId).collect(Collectors.toList()))
- .setStartDate(firstDate).setEndDate(lastDate)
+ .setStartDate(firstDate)
+ .setEndDate(lastDate)
.setSltManageType((byte) 2)
);
// 把区间计算的租赁费用覆盖已结算的用作展示
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml
index e644c6b4..3473de0c 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml
@@ -76,6 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND cpm.month = #{month}
+
+ AND pmc.TYPE = #{settlementType}
+
GROUP BY
pmc.AGREEMENT_ID, pmc.TYPE
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
index 2d332883..02b4e52e 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml
@@ -1122,23 +1122,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"