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/DeviceReportMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
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