From 0f55010fa337a183799d095b4004341fd50d22a6 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Tue, 18 Mar 2025 18:25:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8A=E7=9A=84=E5=87=BA?=
=?UTF-8?q?=E5=BA=93=E9=87=8F=E4=B8=8E=E9=A2=86=E6=96=99=E5=8D=95=E9=87=8C?=
=?UTF-8?q?=E7=9A=84=E5=87=BA=E5=BA=93=E9=87=8F=E4=B8=8D=E4=B8=80=E8=87=B4?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../material/settlement/SltAgreementReduceMapper.xml | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml
index f1439e85..da7b461b 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml
@@ -92,14 +92,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where
sai.agreement_id = #{agreementId}
- AND start_time <= #{endTime}
- AND (end_time >= #{startTime} OR end_time IS NULL)
+ AND(
+ DATE_FORMAT(start_time,'%Y-%m-%d') BETWEEN DATE_FORMAT(#{startTime},'%Y-%m-%d') AND DATE_FORMAT(#{endTime},'%Y-%m-%d') OR
+ DATE_FORMAT(start_time,'%Y-%m-%d') BETWEEN DATE_FORMAT(#{startTime},'%Y-%m-%d') AND DATE_FORMAT(#{endTime},'%Y-%m-%d')
+ )
and sai.type_id = #{typeId}
+
+ AND INSTR(mt2.type_name,#{maName}) >0
+
+
+ AND INSTR(mt.type_name,#{typeName}) >0
+
) rs
GROUP BY rs.typeId,rs.startTime
ORDER BY rs.maName