From 36c42ccd8c683156a691803d1fd5864751e3852c Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Thu, 14 Nov 2024 15:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E9=A5=B0=E5=AE=A1=E6=A0=B8--=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BASQL=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RepairAuditDetailsController.java         |  2 +-
 .../repair/RepairAuditDetailsMapper.xml       | 84 +++++++++----------
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java
index 4f517653..d188055e 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java
@@ -81,7 +81,7 @@ public class RepairAuditDetailsController extends BaseController {
             bean.setParams(params);
         }
         List<RepairAuditDetailsVO> list = repairAuditDetailsService.exportRepairQuestList(bean);
-        ExcelUtil<RepairAuditDetailsVO> util = new ExcelUtil<RepairAuditDetailsVO>(RepairAuditDetailsVO.class);
+        ExcelUtil<RepairAuditDetailsVO> util = new ExcelUtil<>(RepairAuditDetailsVO.class);
         util.exportExcel(response, list, "修试审核任务列表");
     }
 
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 d047453d..6633325e 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
@@ -84,23 +84,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="exportRepairQuestList" resultType="com.bonus.material.repair.domain.vo.RepairAuditDetailsVO">
         SELECT DISTINCT
-        tk.task_id taskId,
-        tk.CODE scrapNum,
-        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,
-        mt1.type_name as type,
-        mt.type_name as typeName,
-        mma.ma_code as maCode,
-        rad.repair_num as repairNum2,
-        rad.repaired_num as repairedNum2,
-        rad.scrap_num as scrapNum2
+            tk.task_id taskId,
+            tk.CODE scrapNum,
+            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,
+            mt1.type_name as type,
+            mt.type_name as typeName,
+            mma.ma_code as maCode,
+            rad.repair_num as repairNum2,
+            rad.repaired_num as repairedNum2,
+            rad.scrap_num as scrapNum2
         FROM
-        tm_task tk
+            tm_task tk
         LEFT JOIN tm_task_agreement tta ON tk.task_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
@@ -111,33 +111,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join ma_machine mma on rad.ma_id= mma.ma_id
         LEFT JOIN sys_user su ON su.user_id = tk.create_by
         WHERE
-        tk.task_type = 45
-        <if test="keyword != null and keyword != ''">
-            AND (locate(#{keyword}, su.nick_name) > 0
-            or locate(#{keyword}, tk.CODE) > 0
-            or locate(#{keyword}, bui.unit_name) > 0
-            or locate(#{keyword}, bpl.pro_name) > 0)
-        </if>
-        <if test="backUnit != null and backUnit != ''">
-            and bui.unit_id = #{backUnit}
-        </if>
-        <if test="taskStatus != null and taskStatus != ''">
-            and tk.task_status = #{taskStatus}
-        </if>
-        <if test="backPro != null and backPro != ''">
-            and bpl.pro_id = #{backPro}
-        </if>
-        <if test="type != null and type != ''">
-            and mt1.type_id = #{type}
-        </if>
-        <if test="backCode != null and backCode != ''">
-            and locate(#{backCode}, tk.code) > 0
-        </if>
-        <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''">
-            and tk.create_time between #{params.beginTime} and #{params.endTime}
-        </if>
+            tk.task_type = 45
+            <if test="keyword != null and keyword != ''">
+                AND (locate(#{keyword}, su.nick_name) > 0
+                or locate(#{keyword}, tk.CODE) > 0
+                or locate(#{keyword}, bui.unit_name) > 0
+                or locate(#{keyword}, bpl.pro_name) > 0)
+            </if>
+            <if test="backUnit != null and backUnit != ''">
+                and bui.unit_id = #{backUnit}
+            </if>
+            <if test="taskStatus != null and taskStatus != ''">
+                and tk.task_status = #{taskStatus}
+            </if>
+            <if test="backPro != null and backPro != ''">
+                and bpl.pro_id = #{backPro}
+            </if>
+            <if test="type != null and type != ''">
+                and mt1.type_id = #{type}
+            </if>
+            <if test="backCode != null and backCode != ''">
+                and locate(#{backCode}, tk.code) > 0
+            </if>
+            <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''">
+                and tk.create_time between #{params.beginTime} and #{params.endTime}
+            </if>
         ORDER BY
-        tk.create_time DESC
+            tk.create_time DESC
     </select>
 
     <select id="getRepairRecord" resultType="com.bonus.material.repair.domain.RepairRecord">