From cf935f714ff122dd1f11b023d26a96a3a0588885 Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Thu, 25 Sep 2025 11:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=BB=B4=E4=BF=AE=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E5=8E=BB=E6=8E=89=E5=AE=9A=E6=8D=9F=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settlement/SltAgreementInfoMapper.xml     | 12 +++++++++++
 .../mapper/material/task/TmTaskMapper.xml     | 21 ++++++++++++++-----
 2 files changed, 28 insertions(+), 5 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 a1c86243..784c9548 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
@@ -1376,6 +1376,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join  tm_task_agreement tta on tta.task_id = tt.task_id
         left join sys_dict_data sdd on sdd.dict_value = tt.task_status and sdd.dict_type = 'repair_task_status'
         where tta.agreement_id = #{agreementId} and tt.task_type = 4  and tt.task_status != 1
+
+        and tt.task_id not in (	  select
+        tt.task_id as taskId
+
+        from tm_task tt
+        left join  tm_task_agreement tta on tta.task_id = tt.task_id
+        LEFT JOIN repair_apply_details rad on tt.task_id = rad.task_id and is_ds =1
+        where tta.agreement_id = #{agreementId} and tt.task_type = 4  and tt.task_status != 1
+        AND IFNULL(rad.repaired_num,0) > 0
+        )
+
+
         <if test="repairCode != null">
             and  tt.code like concat('%', #{repairCode}, '%')
         </if>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml
index faf85c2f..512c470d 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTmTaskList" parameterType="com.bonus.material.task.domain.TmTask" resultMap="TmTaskResult">
         <include refid="selectTmTaskVo"/>
-        <where>  
+        <where>
             <if test="taskType != null "> and task_type = #{taskType}</if>
             <if test="taskStatus != null "> and task_status = #{taskStatus}</if>
             <if test="code != null  and code != ''"> and code = #{code}</if>
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null "> and company_id = #{companyId}</if>
         </where>
     </select>
-    
+
     <select id="selectTmTaskByTaskId" parameterType="Long" resultMap="TmTaskResult">
         <include refid="selectTmTaskVo"/>
         where task_id = #{taskId}
@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{taskId}
         </foreach>
     </select>
-        
+
     <insert id="insertTmTask" parameterType="com.bonus.material.task.domain.TmTask" useGeneratedKeys="true" keyProperty="taskId">
         insert into tm_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTmTaskByTaskIds" parameterType="String">
-        delete from tm_task where task_id in 
+        delete from tm_task where task_id in
         <foreach item="taskId" collection="array" open="(" separator="," close=")">
             #{taskId}
         </foreach>
@@ -273,5 +273,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from tm_task tt
                  left join  tm_task_agreement tta on tta.task_id = tt.task_id
         where tta.agreement_id = #{agreementId} and tt.task_type = 4  and tt.task_status != 1
+
+				and tt.task_id not in (	  select
+            tt.task_id as taskId
+
+        from tm_task tt
+                 left join  tm_task_agreement tta on tta.task_id = tt.task_id
+								 LEFT JOIN repair_apply_details rad on tt.task_id = rad.task_id and is_ds =1
+        where tta.agreement_id = #{agreementId} and tt.task_type = 4  and tt.task_status != 1
+				AND IFNULL(rad.repaired_num,0) > 0
+				)
+
     </select>
-</mapper>
\ No newline at end of file
+</mapper>