From 23f360358e078f65655e31b652b9f999c6cbe01b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 15 Aug 2023 10:38:22 +0800
Subject: [PATCH] 险情上报中文转码保存

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 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 2644aaf..0faddac 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
@@ -34,14 +34,15 @@
             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
+        SELECT
+               R.ID,
+               R.create_time,
+               R.ENCDATA,
+               R.SM4IV,
+               R.KEYINDEXS FROM SM_DANGER_REPORT R
         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},'%')
@@ -57,6 +58,7 @@
         </if>
         ORDER BY R.UPDATE_TIME DESC
     </select>
+
     <select id="getStatistics" resultType="cn.gistack.sm.jcsb.vo.StatisticsVO">
         SELECT * FROM
                      (SELECT COUNT(1)AS patrolCount FROM  SM_PATROL_TASK WHERE PROJECT_ID =#{resGuid} AND IS_DELETED = 0)p,

--
Gitblit v1.9.3