From d5e54730c693c52a1e29d0aeca7056d7dffd2960 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Sat, 27 Jul 2024 18:39:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checking/controller/CheckingPointController.java       | 1 +
 .../zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java  | 2 ++
 .../modules/checking/mapper/xml/CheckingPointMapper.xml    | 7 +++++++
 3 files changed, 10 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java b/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java
index 8a6ef29ab..f6dd3a3d2 100644
--- a/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/checking/controller/CheckingPointController.java
@@ -50,6 +50,7 @@ public class CheckingPointController {
     @ApiOperation(value = "分页查询巡检点列表", notes = "分页查询巡检点列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "xzCheckingRouteTaskId", value = "星纵-巡检路线的任务Id", paramType = "query", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "search", value = "搜索巡检点名称、区域、责任人", paramType = "query", required = false, dataType = "String"),
     })
     @PostMapping(value = "/selectPage")
     public Result<IPage<CheckingPoint>> selectCheckingPointPage(@RequestBody ProjectSnQO qo) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java b/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java
index bcbecdd77..d097e386a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java
+++ b/src/main/java/com/zhgd/xmgl/modules/checking/entity/qo/ProjectSnQO.java
@@ -24,5 +24,7 @@ public class ProjectSnQO extends PageQO {
     private String xzCheckingRouteTaskId;
     @ApiModelProperty("巡检点id")
     private String checkingPointId;
+    @ApiModelProperty("搜索巡检点名称、区域、责任人")
+    private String search;
 
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml
index 94e6c02b0..05c231f32 100644
--- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/CheckingPointMapper.xml
@@ -16,6 +16,7 @@
         su.real_name as createUserName
         from checking_point t
         left join system_user su on su.user_id=t.create_user_id
+        left join system_user su1 on find_in_set( su1.user_id, t.inspect_user_ids )
         left join enterprise_info ei on find_in_set(ei.id,t.enterprise_id)
         left join quality_region qr on qr.id=t.quality_region_id
         <if test="projectSnQo.xzCheckingRouteTaskId != null and projectSnQo.xzCheckingRouteTaskId != ''">
@@ -44,6 +45,12 @@
             <if test="projectSnQo.checkingPointName != null and projectSnQo.checkingPointName != ''">
                 and t.checking_point_name like CONCAT(CONCAT('%', #{projectSnQo.checkingPointName}), '%')
             </if>
+            <if test="projectSnQo.search != null and projectSnQo.search != ''">
+                and (t.checking_point_name like CONCAT(CONCAT('%', #{projectSnQo.search}), '%')
+                or qr.region_name like CONCAT(CONCAT('%', #{projectSnQo.search}), '%')
+                or su1.real_name like CONCAT(CONCAT('%', #{projectSnQo.search}), '%')
+                )
+            </if>
         </where>
         group by t.id
         <choose>