From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml
index 59928d1..4b34a62 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml
@@ -8,6 +8,7 @@
<result property="desinfo" column="desinfo"/>
<result property="type" column="type"/>
<result property="toUser" column="to_user"/>
+ <result property="reportUser" column="reportUser"/>
<result property="toImages" column="to_images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result property="toDesinfo" column="to_desinfo"/>
<result property="status" column="status"/>
@@ -19,10 +20,11 @@
<result property="isDeleted" column="is_deleted"/>
<result property="reservoirId" column="reservoir_id"/>
<result property="reservoirName" column="reservoirName"/>
+ <result property="toUserName" column="toUserName"/>
</resultMap>
<select id="getAll" resultMap="vo">
- SELECT SDR.*,arb."name" reservoirName FROM SM_DANGER_REPORT SDR
+ SELECT SDR.*,arb."name" reservoirName FROM SM_DANGER_REPORT SDR
LEFT JOIN "SJZT_MD"."att_res_base" arb ON arb."guid" = SDR.RESERVOIR_ID
WHERE SDR.IS_DELETED = 0
<if test="dangerReport.toUser !=null and dangerReport.toUser !=''">
@@ -32,4 +34,23 @@
AND SDR.status = #{dangerReport.status}
</if>
</select>
+ <select id="selectRecordPage" resultMap="vo">
+ SELECT R.*,
+ arb."name" AS reservoirName,
+ U.REAL_NAME AS toUserName,
+ U2.REAL_NAME AS reportUser FROM SM_DANGER_REPORT R
+ LEFT JOIN BLADE_USER U ON U.ID = R.TO_USER
+ LEFT JOIN BLADE_USER U2 ON U2.ID = R.CREATE_USER
+ LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = R.RESERVOIR_ID
+ WHERE R.IS_DELETED = 0
+ <if test="dangerReportVO.reservoirName != null and dangerReportVO.reservoirName !=''">
+ AND arb."name" LIKE CONCAT('%',#{dangerReportVO.reservoirName},'%')
+ </if>
+ <if test="dangerReportVO.toUser != null and dangerReportVO.toUser !=''">
+ AND r.to_user = #{dangerReportVO.toUser}
+ </if>
+ <if test="dangerReportVO.status != null and dangerReportVO.status !=''">
+ AND r.status = #{dangerReportVO.status}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3