From 3f2109d3ea171aa26251a30a86dc1ea7d7f77e5e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 14 Jun 2023 16:42:55 +0800
Subject: [PATCH] 监测上报
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DeviceReportMapper.xml | 8 +++++---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DangerReportMapper.xml | 7 +++++--
2 files changed, 10 insertions(+), 5 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 9fe1e61..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
@@ -24,7 +24,7 @@
</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 !=''">
@@ -35,7 +35,10 @@
</if>
</select>
<select id="selectRecordPage" resultMap="vo">
- SELECT R.*,arb."name" reservoirName,U.REAL_NAME toUserName,U2.REAL_NAME reportUser FROM SM_DANGER_REPORT R
+ 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
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DeviceReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DeviceReportMapper.xml
index b109980..c0a1274 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DeviceReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DeviceReportMapper.xml
@@ -2,13 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.gistack.sm.jcsb.mapper.DeviceReportMapper">
-
+ <resultMap id="vo" type="cn.gistack.sm.jcsb.vo.DeviceReportVO">
+ <id property="id" column="id"/>
+ </resultMap>
<select id="getDetail" resultType="cn.gistack.sm.jcsb.vo.DeviceReportVO">
SELECT * FROM JCSB_DEVICE_REPORT
</select>
<select id="selectDeviceReportPage" resultType="cn.gistack.sm.jcsb.vo.DeviceReportVO">
- SELECT id,description,device_code,device_type,rainfall,water_level,flow,water_storage,specific_flood_limit,temporal_rainfall,record_time
- FROM JCSB_DEVICE_REPORT WHERE is_deleted = 0
+ SELECT *
+ FROM SM_DEVICE_REPORT WHERE is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3