From cf119adeab46dcc843c4c7b28a719a0c027d7c88 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 26 Jul 2024 15:13:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
index 77511d2..ff2707f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
@@ -46,6 +46,11 @@
<result property="resRegCode" column="resRegCode"/>
<result property="lon" column="lon"/>
<result property="lat" column="lat"/>
+ <result property="reportTime" column="report_time"/>
+ <result property="yRain" column="y_rain"/>
+ <result property="isBaiyiAction" column="is_baiyi_action"/>
+ <result property="mainZ" column="main_z"/>
+ <result property="mainOZ" column="main_o_z"/>
</resultMap>
@@ -131,8 +136,29 @@
</select>
<select id="getDetailVO" resultMap="vo">
- SELECT R.*,arb."name" reservoirName FROM SM_REPORT_FLOOD_RECORD r
+ SELECT R.*,arb."name" reservoirName ,
+ arb."res_reg_code" as resRegCode,
+ arb."eng_scal" as engScal,
+ arb."center_long" lon,
+ arb."center_lat" lat,
+ case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode,
+ case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName,
+ case when town."ad_grad" = 3 THEN town."ad_code"
+ when county."ad_grad" = 3 THEN county."ad_code" END AS countyCode,
+ case when town."ad_grad" = 3 THEN town."ad_name"
+ when county."ad_grad" = 3 THEN county."ad_name" END AS countyName,
+ case when town."ad_grad" = 2 THEN town."ad_code"
+ when county."ad_grad" = 2 THEN county."ad_code"
+ ELSE city."ad_code" END AS cityCode,
+ case when town."ad_grad" = 2 THEN town."ad_name"
+ when county."ad_grad" = 2 THEN county."ad_name"
+ ELSE city."ad_name" END AS cityName
+ FROM SM_REPORT_FLOOD_RECORD r
LEFT JOIN "SJZT_MD"."att_res_base" arb on arb."guid" = r.reservoir_id
+ LEFT JOIN SJZT_MD."att_ad_base"town ON arb."interior_ad_guid" = town."guid"
+ LEFT JOIN SJZT_MD."att_ad_base" county ON town."p_ad_code" = county."guid"
+ LEFT JOIN SJZT_MD."att_ad_base" city ON county."p_ad_code" = city."guid"
+ LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code"
WHERE r.is_deleted = 0 AND r.id = #{id}
</select>
</mapper>
--
Gitblit v1.9.3