From c94885d4e04fffc973678ca068bc2e1fbc97823f Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 03 Jul 2023 19:12:05 +0800
Subject: [PATCH] 数据校验规则准备

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
index f25ea72..f3b04b7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
@@ -11,6 +11,7 @@
         <result property="reportTime" column="report_time"/>
         <result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
         <result property="videos" column="videos" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+        <result property="reportUser" column="real_name"/>
 
         <result property="createDept" column="create_dept"/>
         <result property="createUser" column="create_user"/>
@@ -23,8 +24,9 @@
     </resultMap>
 
     <select id="selectRecordPage" resultMap="vo">
-        SELECT R.*,arb."name" reservoirName FROM SM_MANAGE_PROTECT_RECORD R
+        SELECT R.*,arb."name" reservoirName,U.REAL_NAME FROM SM_MANAGE_PROTECT_RECORD R
         LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = R.reservoir_id
+        LEFT JOIN BLADE_USER U ON U.ID = R.CREATE_USER
         WHERE R.IS_DELETED = 0
         <if test="record.reservoirName != null and record.reservoirName !=''">
             AND arb."name" LIKE CONCAT('%',#{record.reservoirName},'%')
@@ -32,5 +34,6 @@
         <if test="record.type !=null and record.type !=''">
             AND R.type = #{record.type}
         </if>
+        ORDER BY R.CREATE_TIME DESC
     </select>
 </mapper>

--
Gitblit v1.9.3