From 1bbfc1dd731f8d4660a0f236ae59198bab14fde5 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 22 Dec 2023 12:32:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AF=95=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/domain/RepairTestInputDto.java   |  3 +++
 .../mapper/material/RepairTestInputMapper.xml | 27 ++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java
index 4fcf1693..038cd974 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairTestInputDto.java
@@ -24,4 +24,7 @@ public class RepairTestInputDto{
     /** 规格型号*/
     private String typeId;
 
+    /** 维修时间*/
+    private String wxTime;
+
 }
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml
index 33373f26..1af4aea7 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml
@@ -67,8 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM (
                 SELECT ANY_VALUE(rid.task_id) AS id,
                 ANY_VALUE(tt2.`code`) AS repairCode,
-                ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName)) AS maTypeName,
-                ANY_VALUE(GROUP_CONCAT(DISTINCT a.type_id)) AS type_id,
+                ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName2)) AS maTypeName,
+                ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeId2)) AS typeId2,
                 ANY_VALUE(tt2.create_by) AS wxName,
                 ANY_VALUE(tt2.create_time) AS wxTime,
                 ANY_VALUE(IFNULL(sd.`name`,'入库进行中')) AS taskStatus
@@ -77,27 +77,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN sys_dic sd ON tt.task_status = sd.id
                 LEFT JOIN tm_task tt2 ON rid.repair_id = tt2.task_id
                 LEFT JOIN (
-                    SELECT mt2.type_id,mt2.type_name AS typeName,mt.manage_type
+                    SELECT mt.type_id AS typeId,mt.type_name AS typeName,mt.manage_type,mt2.type_id AS typeId2,mt2.type_name AS typeName2
                     FROM ma_type mt
                     LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
                     LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
                     LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
                     WHERE mt.`level` = '4'
-                )a ON rid.type_id = a.type_id
-                <where>
-                    <if test="keyWord!=null and keyWord!=''">
-                        (
-                        INSTR(tt.`code`,#{keyWord}) > 0 OR
-                        INSTR(tt2.create_by,#{keyWord}) > 0
-                        )
-                    </if>
-                </where>
+                )a ON rid.type_id = a.typeId
                 GROUP BY rid.task_id
                 ORDER BY tt.create_time DESC
             ) b
         <where>
             <if test="deviceTypeId!=null and deviceTypeId!=''">
-                INSTR(b.type_id,#{deviceTypeId}) > 0
+                INSTR(b.typeId2,#{deviceTypeId}) > 0
+            </if>
+            <if test="wxTime!=null and wxTime!=''">
+               AND b.wxTime BETWEEN CONCAT(#{wxTime},' 00:00:00') AND CONCAT(#{wxTime},' 23:59:59')
+            </if>
+            <if test="keyWord!=null and keyWord!=''">
+               AND (
+                INSTR(b.repairCode,#{keyWord}) > 0 OR
+                INSTR(b.wxName,#{keyWord}) > 0
+                )
             </if>
         </where>
     </select>