From 54843d459f3fe623e6cf2956f192141e9a99b878 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期四, 30 十一月 2023 13:03:29 +0800
Subject: [PATCH] 临时提交
---
src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml b/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
index c2e620d..60fefe5 100644
--- a/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
+++ b/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
@@ -82,8 +82,6 @@
<result property="acceptCreateTime" column="accept_create_time"/>
<result property="acceptStatus" column="accept_status"/>
<result property="stage" column="stage"/>
-
-
<result property="scheduleCreateUserId" column="schedule_create_user_id"/>
<result property="scheduleCreateUserName" column="schedule_create_user_name"/>
<result property="scheduleCheckUserId" column="schedule_check_user_id"/>
@@ -96,16 +94,14 @@
<result property="jobMessage" column="job_message"/>
<result property="status" column="status"/>
<result property="exceptionInfo" column="exception_info"/>
-
<result property="troubleshootTypeCycleNum" column="type_cycle_num"/>
<result property="troubleshootTypeCycleType" column="type_cycle_type"/>
-
-
<result property="checkType" column="check_type"/>
-
-
<result property="companyId" column="company_id"/>
+
+ <result property="checkPerson" column="check_person"/>
+ <result property="findTime" column="find_time"/>
</resultMap>
<sql id="selectHiddenDangerCheckPointVo">
@@ -132,7 +128,8 @@
c.check_type,a.company_id,
b.type_cycle_num,b.type_cycle_type,
- a.examine_user_id, a.examine_user_name
+ a.examine_user_id, a.examine_user_name,
+ a.check_person, a.find_time
from tr_hidden_danger_check_point a
left join tr_hidden_danger_check c on c.check_id = a.check_id
left join tr_troubleshoot_type b on c.troubleshoot_type_id = b.type_id
@@ -261,21 +258,21 @@
a.plan_formulate_status != #{planFormulateStatusExclude}
</if>
<if test="judgeQueryByUserId != null and judgeQueryByUserId != ''">
- and a.danger_sources = 2
+ and a.danger_sources in (2,3)
and (a.register_user_id = #{judgeQueryByUserId} or (a.judge_user_id = #{judgeQueryByUserId} and
a.report_status IS NOT NULL) )
</if>
<if test="null != judgeQueryByUserIdList and judgeQueryByUserIdList.size() > 0">
- and a.danger_sources = 2 and a.report_status IS NOT NULL and (a.judge_user_id in
+ and a.danger_sources in (2,3) and a.report_status IS NOT NULL and (a.judge_user_id in
<foreach collection="judgeQueryByUserIdList" item="judgeQueryByUserId" open="(" separator="," close=")">
#{judgeQueryByUserId}
</foreach>)
</if>
<if test="reportStatusByHasHandle != null and reportStatusByHasHandle != ''">and (a.report_status = 1 or
- a.report_status = 2)
+ a.report_status = 2 or a.report_status = 3)
</if>
<if test="reportStatusIsNotNull != null and reportStatusIsNotNull != ''">and (a.report_status IS NOT
NULL)
@@ -419,12 +416,13 @@
<if test="acceptCreateTime != null ">accept_create_time,</if>
<if test="acceptStatus != null and acceptStatus != ''">accept_status,</if>
<if test="stage != null and stage != ''">stage,</if>
-
-
<if test="scheduleCheckStatus != null and scheduleCheckStatus != ''">schedule_check_status,</if>
<if test="checkType != null and checkType != ''">check_type,</if>
-
<if test="companyId != null and companyId != ''">company_id,</if>
+
+
+ <if test="checkPerson != null and checkPerson != ''">check_person,</if>
+ <if test="findTime != null ">find_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null ">#{id},</if>
@@ -482,12 +480,13 @@
<if test="acceptCreateTime != null ">#{acceptCreateTime},</if>
<if test="acceptStatus != null and acceptStatus != ''">#{acceptStatus},</if>
<if test="stage != null and stage != ''">#{stage},</if>
-
-
<if test="scheduleCheckStatus != null and scheduleCheckStatus != ''">#{scheduleCheckStatus},</if>
<if test="checkType != null and checkType != ''">#{checkType},</if>
-
<if test="companyId != null and companyId != ''">#{companyId},</if>
+
+
+ <if test="checkPerson != null and checkPerson != ''">#{checkPerson},</if>
+ <if test="findTime != null ">#{findTime},</if>
</trim>
</insert>
@@ -563,7 +562,8 @@
</if>
<if test="checkType != null and checkType != ''">check_type = #{checkType},</if>
-
+ <if test="checkPerson != null and checkPerson != ''">check_person = #{checkPerson},</if>
+ <if test="findTime != null ">find_time = #{findTime},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.2