From 4631cec07c0ae65bd23a5754f3f896d55ce4d115 Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Wed, 3 Dec 2025 16:05:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E4=B8=8B=E5=9C=A8?=
=?UTF-8?q?=E7=94=A8=E8=AF=A6=E7=BB=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/material/basic/ComplexQueryMapper.xml | 2 +-
.../resources/mapper/material/push/IwsCostPushMapper.xml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
index ea9b09f3..aeb1e37b 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml
@@ -978,7 +978,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
`status` = '0'
AND end_time IS NULL
AND back_id IS NULL
- AND `is_slt` = '0'
+ AND `is_slt` = '0' and source =1
AND type_id = #{typeId}
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 93ca3e19..af824e12 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
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN slt_agreement_apply saa ON saa.agreement_id = bma.agreement_id AND saa.`status` = '2' AND saa.settlement_type = 1
LEFT JOIN slt_agreement_apply saas ON saas.agreement_id = bma.agreement_id AND saas.`status` = '2' AND saas.settlement_type = 2
- bp.external_id is not null and bu.unit_id not in (117,4055)
+ bp.external_id is not null and bu.unit_id not in (68,351,412,117,4055)
AND bma.agreement_code LIKE CONCAT('%',#{agreementCode},'%')
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
slt_agreement_details sad
left join slt_agreement_apply saa on sad.apply_id = saa.id
LEFT JOIN bm_agreement_info bma ON bma.agreement_id = saa.agreement_id
- WHERE LEFT(saa.audit_time,7) = #{month} AND sad.slt_type = 2
+ WHERE LEFT(saa.create_time,7) = #{month} AND sad.slt_type = 2
GROUP BY bma.agreement_id
UNION
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
slt_agreement_details sad
left join slt_agreement_apply saa on sad.apply_id = saa.id
LEFT JOIN bm_agreement_info bma ON bma.agreement_id = saa.agreement_id
- WHERE LEFT(saa.audit_time,7) = #{month} AND sad.slt_type = 3 and sad.is_charge = 1
+ WHERE LEFT(saa.create_time,7) = #{month} AND sad.slt_type = 3 and sad.is_charge = 1
GROUP BY bma.agreement_id
UNION
@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
slt_agreement_details sad
left join slt_agreement_apply saa on sad.apply_id = saa.id
LEFT JOIN bm_agreement_info bma ON bma.agreement_id = saa.agreement_id
- WHERE LEFT(saa.audit_time,7) = #{month} AND sad.slt_type = 4 and sad.is_charge = 1
+ WHERE LEFT(saa.create_time,7) = #{month} AND sad.slt_type = 4 and sad.is_charge = 1
GROUP BY bma.agreement_id
) a ON
pmc.AGREEMENT_ID = a.agreementId