From cd8d35212fbe26edb44580e89090be036492f9d7 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 14 Jul 2025 13:44:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/lease/LeaseApplyInfoMapper.xml   |  2 +-
 .../repair/RepairAuditDetailsMapper.xml       | 30 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
index a2805b81..26e4f6f4 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
@@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
              </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                <![CDATA[ AND DATE_FORMAT( lai.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
+                and lai.create_time BETWEEN CONCAT(#{startTime},' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
             </if>
             <if test="directId != null "> and lai.direct_id = #{directId}</if>
             <if test="leaseType != null  and leaseType != ''"> and lai.lease_type = #{leaseType}</if>
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
index d4ec8416..8449fa25 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
@@ -311,23 +311,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectRepairQuestList" resultType="com.bonus.material.repair.domain.vo.ScrapApplyDetailsVO">
         SELECT DISTINCT
-            tk.task_id taskId,
-            tk.CODE scrapNum,tt.code as repairTaskCode,
-            tk.task_status taskStatus,
-            bui.unit_name unitName,
-            bpl.pro_name projectName,
-            su.nick_name createBy,
-            tk.create_time createTime,
-            tk.remark,
-            tk.CODE repairNum
+        tk.task_id taskId,
+        tk.CODE scrapNum,
+        tt2.CODE AS repairTaskCode,
+        tk.task_status taskStatus,
+        bui.unit_name unitName,
+        bpl.pro_name projectName,
+        su.nick_name createBy,
+        tk.create_time createTime,
+        tk.remark,
+        tk.CODE repairNum
         FROM
-            tm_task tk
-        LEFT JOIN tm_task tt on tk.pre_task_id = tt.task_id
-        LEFT JOIN tm_task_agreement tta ON tk.task_id = tta.task_id
+        tm_task tk
+        LEFT JOIN tm_task tt ON tk.pre_task_id = tt.task_id
+        LEFT JOIN repair_audit_details rad ON tk.task_id = rad.task_id
+        LEFT JOIN tm_task tt2 on tt2.task_id = rad.repair_id
+        LEFT JOIN tm_task_agreement tta ON rad.repair_id = tta.task_id
         LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
         LEFT JOIN bm_project bpl ON bai.project_id = bpl.pro_id
         LEFT JOIN bm_unit bui ON bai.unit_id = bui.unit_id
-        LEFT JOIN repair_audit_details rad ON tk.task_id = rad.task_id
         LEFT JOIN ma_type mt ON rad.type_id = mt.type_id
         LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
         LEFT JOIN sys_user su ON su.user_id = tk.create_by
@@ -350,7 +352,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and locate(#{backCode}, tk.code) > 0
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                <![CDATA[and DATE_FORMAT( tk.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
+                and tk.create_time BETWEEN CONCAT(#{startTime},' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
             </if>
            <if test="appTaskStatus != null and appTaskStatus == 10">
                 and tk.task_status = #{appTaskStatus}