From b6799305301db96a0f9bc72b75533eb5bfc275bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Fri, 22 Mar 2024 01:23:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/trouble/sspProblemmodify/index.vue | 16 ++++++++--------
 .../mapper/trouble/SmzSspProblemmodifyMapper.xml |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue
index 49c25664..8a554ecf 100644
--- a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue
+++ b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue
@@ -26,14 +26,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="整改人" prop="lordSent">
-        <el-input
-          v-model="queryParams.lordSent"
-          placeholder="请输入整改人姓名/联系方式"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="隐患描述" prop="workParts">
         <el-input
           v-model="queryParams.workParts"
@@ -52,6 +44,14 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="整改人" prop="lordSent">
+        <el-input
+          v-model="queryParams.lordSent"
+          placeholder="请输入整改人姓名/联系方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="提交时间">
         <el-date-picker
           v-model="daterangeMarksTime"
diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index e45f554d..cb0062b6 100644
--- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -215,6 +215,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="workParts != null  and workParts != ''"> and ssp.workParts like concat('%', #{workParts}, '%')</if>
         <if test="createUser != null  and createUser != ''"> and ssp.createUser like concat('%', #{createUser}, '%')</if>
         <if test="dangerType != null  and dangerType != ''"> and ssp.danger_type = #{dangerType}</if>
+        <if test="lordSent != null  and lordSent != ''"> and (ssp.lordSent like concat('%', #{lordSent}, '%') or ssp.lordSentUser like concat('%', #{lordSent}, '%'))</if>
         <if test="params.beginMarksTime != null and params.beginMarksTime != '' and params.endMarksTime != null and params.endMarksTime != ''"> and date(ssp.createTime) between #{params.beginMarksTime} and #{params.endMarksTime}</if>
         <!-- 查询条件-项目部门 -->
         <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
@@ -241,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="projectId != null "> and ssp.projectId = #{projectId}</if>
         and (date(NOW())<![CDATA[ > ]]> date(ssp.nickedTime) and (ssp.updateTime is null or date(ssp.updateTime) <![CDATA[ > ]]> date(ssp.nickedTime)))
         <if test="infoType !=null">and infoType=#{infoType}</if>
+        <if test="lordSent != null  and lordSent != ''"> and (ssp.lordSent like concat('%', #{lordSent}, '%') or ssp.lordSentUser like concat('%', #{lordSent}, '%'))</if>
         <if test="problemArea != null  and problemArea != ''"> and ssp.problemArea like concat('%', #{problemArea}, '%')</if>
         <if test="workParts != null  and workParts != ''"> and ssp.workParts like concat('%', #{workParts}, '%')</if>
         <if test="createUser != null  and createUser != ''"> and ssp.createUser like concat('%', #{createUser}, '%')</if>