From 27906c83ccaff87315406ae804063f5e1e09eeb8 Mon Sep 17 00:00:00 2001
From: lujiang <ljxuzhou@163.com>
Date: Wed, 4 Sep 2024 01:01:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=8E=86=E5=8F=B2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/RepairHisController.java | 26 ++++++++++++++++++-
 .../mapper/admin/RepairHisMapper.xml          |  2 ++
 shoot-hand/ics-web/pom.xml                    |  2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairHisController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairHisController.java
index 63d7660..00ea13e 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairHisController.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/RepairHisController.java
@@ -27,7 +27,22 @@ public class RepairHisController extends BaseController {
     private IRepairHisService repairHisService;
 
     /**
-     * 查询VIEW列表
+     * pageNum：第几页
+     * pageSize：每页数量
+     * name：报修人姓名，模糊查询
+     * tel：报修人电话，模糊查询
+     * bxorder：工单编号，模糊查询
+     * gztype：设备类型名称，模糊查询
+     * gzname：设备名称，模糊查询
+     * addr：地点，模糊查询
+     * floor：楼层名称，模糊查询
+     * fjh：房间号，模糊查询
+     * wxrname：维修人姓名，模糊查询
+     * wxrtel：维修人电话，模糊查询
+     * desc：问题描述，模糊查询
+     * <p>
+     * beginTime : 工单创建日期范围；开始时间;格式示例 2024-08-22；成对出现
+     * endTime   : 工单创建日期范围；结束时间;格式示例 2024-08-25；成对出现
      */
     @RequiresPermissions(value = {"repair:manage:operator"})
     @RequestMapping("list")
@@ -50,6 +65,15 @@ public class RepairHisController extends BaseController {
         return result(repairHisService.getRepairHisList(repairHis));
     }
 
+    /**
+     * 工单历史数据 详情接口
+     *
+     * 返回工单数据
+     * logs字段为工单处理日志
+     *
+     * @param bxid 工单id
+     * @return
+     */
     @RequiresPermissions("repair:manage:operator")
     @RequestMapping("get")
     public R get(Long bxid) {
diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairHisMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairHisMapper.xml
index 4739b98..fe8220f 100644
--- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairHisMapper.xml
+++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairHisMapper.xml
@@ -48,6 +48,8 @@
             <if test="name != null  and name != ''"> AND name LIKE CONCAT('%', #{name}, '%')</if>
             <if test="tel != null  and tel != ''"> AND tel LIKE CONCAT('%', #{tel}, '%')</if>
             <if test="bxorder != null  and bxorder != ''"> AND bxorder LIKE CONCAT('%', #{bxorder}, '%')</if>
+            <if test="gztype != null  and gztype != ''"> AND gztype LIKE CONCAT('%', #{gztype}, '%')</if>
+            <if test="gzname != null  and gzname != ''"> AND gzname LIKE CONCAT('%', #{gzname}, '%')</if>
             <if test="addr != null  and addr != ''"> AND addr LIKE CONCAT('%', #{addr}, '%')</if>
             <if test="floor != null  and floor != ''"> AND floor LIKE CONCAT('%', #{floor}, '%')</if>
             <if test="fjh != null  and fjh != ''"> AND fjh LIKE CONCAT('%', #{fjh}, '%')</if>
diff --git a/shoot-hand/ics-web/pom.xml b/shoot-hand/ics-web/pom.xml
index 359903f..3671091 100644
--- a/shoot-hand/ics-web/pom.xml
+++ b/shoot-hand/ics-web/pom.xml
@@ -56,7 +56,7 @@
                 </executions>
             </plugin>
         </plugins>
-        <finalName>ics-demo</finalName>
+        <finalName>shoot-hand</finalName>
     </build>
 
 </project>
\ No newline at end of file