From 0e53b97fbe51baa1df84e1eca8711cd5ca781513 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 31 May 2023 20:11:34 +0800
Subject: [PATCH] 险情上报返回处理人，上报人
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DangerReportVO.java | 7 ++++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml | 4 +++-
2 files changed, 9 insertions(+), 2 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 caf6a34..9fe1e61 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"/>
@@ -34,8 +35,9 @@
</if>
</select>
<select id="selectRecordPage" resultMap="vo">
- SELECT R.*,arb."name" reservoirName,U.REAL_NAME toUserName FROM SM_DANGER_REPORT R
+ SELECT R.*,arb."name" reservoirName,U.REAL_NAME toUserName,U2.REAL_NAME 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 !=''">
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DangerReportVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DangerReportVO.java
index 68c8998..6e11ea5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DangerReportVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DangerReportVO.java
@@ -11,7 +11,12 @@
private String reservoirName;
/**
- * 名称
+ * 处理人名称
*/
private String toUserName;
+
+ /**
+ * 上报人
+ */
+ private String reportUser;
}
--
Gitblit v1.9.3