From 2097a45f7fb94e4fdf72a9520040f5536b562909 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Wed, 19 Nov 2025 15:21:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=AB=A3=E5=B7=A5?=
 =?UTF-8?q?=E6=9C=AA=E9=80=80=E9=A2=84=E8=AD=A6=E9=99=90=E5=88=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/material/push/ProDataUseInfoMapper.xml  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
index 172c2786..20bf321d 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
@@ -317,6 +317,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join ma_type mt2 on mt.parent_id = mt2.type_id
         where sai.is_slt = 0  and bp.actual_end_date is not null  and bp.pro_center is not null and bp.external_id is not null
         and dept_id not in (339,340,342,346)
+        and bai.is_show = 1
         and mt.jiju_type = 1
         and mt2.is_statics != 1
           <if test="deptName != null and deptName != ''">
@@ -342,9 +343,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join ma_type mt on sai.type_id = mt.type_id
         left join ma_type mt2 on mt.parent_id = mt2.type_id
         where  sai.is_slt = 0  and bp.actual_end_date is not null  and bp.pro_center is not null and bp.external_id is not null
+        and sai.status = 0
         and mt.jiju_type = 1
         and mt2.is_statics != 1
         and dept_id not in (339,340,342,346)
+        and bai.is_show = 1
         <if test="deptId != null">
             and sd.dept_id = #{deptId}
         </if>
@@ -707,6 +710,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join bm_project bp on bai.project_id = bp.pro_id
                  left join sys_dept sd on bp.imp_unit = sd.dept_id
         where sai.is_slt = 0 and sai.end_time is null and bp.actual_end_date is not null and sd.dept_name = #{deptName}  and bp.pro_center is not null and bp.external_id is not null
+          and bai.is_show = 1
         GROUP BY bp.pro_center
     </select>
     <select id="getCompletionNotRefundedDetailsSub" resultType="com.bonus.material.push.domain.MachineInfoBean">
@@ -727,6 +731,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join ma_type mt on sai.type_id = mt.type_id
                  left join ma_type mt2 on mt.parent_id = mt2.type_id
         where sai.status = 0 and sai.is_slt = 0 and sai.end_time is null and bp.actual_end_date is not null  and bp.pro_center is not null
+        and bai.is_show = 1
         and mt.jiju_type = 1
         and mt2.is_statics != 1
         and dept_id not in (339,340,342,346)

From 018e3547fd88e677e4bdbeb131bb3852b8c6dc8a Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Wed, 19 Nov 2025 15:28:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BD=92=E8=BF=98=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/settlement/SltAgreementInfoMapper.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 cf59621b..79fa0a40 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
@@ -1692,8 +1692,8 @@
             sad.price as leasePrice,
             sad.num as num,
             DATE(sad.start_time) as startTime,
-            DATE(ifnull(saa.create_time,sad.end_time)) as endTime,
-            DATEDIFF(IF(sad.end_time is null,saa.create_time,sad.end_time), sad.start_time) + 1 as leaseDays
+            DATE(ifnull(sad.end_time,saa.create_time)) as endTime,
+            DATEDIFF(IF(sad.end_time is null,sad.end_time,saa.create_time), sad.start_time) + 1 as leaseDays
         FROM
             bm_agreement_info bai
             LEFT JOIN slt_agreement_apply saa ON bai.agreement_id = saa.agreement_id AND saa.settlement_type = #{settlementType}