From 131b4ec060280288e2c9a95e8841b67ebbb96fc3 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 30 十月 2023 09:23:56 +0800
Subject: [PATCH] 修改

---
 src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml b/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
index e717fb0..c2e620d 100644
--- a/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
+++ b/src/main/resources/mybatis/tr/HiddenDangerCheckPointMapper.xml
@@ -109,7 +109,7 @@
     </resultMap>
 
     <sql id="selectHiddenDangerCheckPointVo">
-        select a.id,a.check_point_id,a.check_id, a.create_by, a.create_time, a.update_by, a.update_time,a.remark,
+        select a.id,a.check_point_id,a.check_id, a.create_by, a.create_time, a.update_by, a.update_time,a.remark,a.accept_status,
         c.plan_create_user_id,
         c.plan_name, c.troubleshoot_type_id,
         c.troubleshoot_type_name, c.organization_dept_id,
@@ -343,6 +343,8 @@
 
             <if test="rectifyUserIdIsNotNull != null  and rectifyUserIdIsNotNull != ''">and a.rectify_user_id is not null</if>
 
+            <if test="acceptStatus != null  and acceptStatus != ''">and a.accept_status  = #{acceptStatus}</if>
+
             <if test="null != companyIdList  and companyIdList.size() > 0">
                 and (a.company_id in
                 <foreach collection="companyIdList" item="companyId" open="(" separator="," close=")">
@@ -350,7 +352,8 @@
                 </foreach>)
             </if>
         </where>
-        order by a.create_time desc
+<!--     todo 查找验收条件,将待验收的放在前面-->
+        order by a.accept_status, a.create_time desc
     </select>
 
     <select id="selectHiddenDangerCheckPointById" parameterType="Long" resultMap="HiddenDangerCheckPointResult">
@@ -918,4 +921,12 @@
         order by a.create_time desc
     </select>
 
+<!--    int editDangerLevel(HiddenDangerCheckPoint hdcp);-->
+    <update id="editDangerLevel" parameterType="HiddenDangerCheckPoint">
+        update tr_hidden_danger_check_point set
+        trouble_type_name = #{troubleTypeName},
+        update_by = #{updateBy},
+        update_time = #{updateTime}
+        where id = #{id}
+    </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.2