From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库：施工：项目查询过滤无效修复、根据角色查询用户
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml | 69 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 7 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 363a65b..7eca52b 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
@@ -28,18 +28,61 @@
<result property="updateUser" column="update_user"/>
<result property="createTime" column="create_time"/>
+ <result property="cityCode" column="cityCode"/>
+ <result property="cityName" column="cityName"/>
+ <result property="countyCode" column="countyCode"/>
+ <result property="countyName" column="countyName"/>
+ <result property="townCode" column="townCode"/>
+ <result property="townName" column="townName"/>
+
+ <result property="engScal" column="engScal"/>
+ <result property="resRegCode" column="resRegCode"/>
+ <result property="lon" column="lon"/>
+ <result property="lat" column="lat"/>
+
</resultMap>
<select id="selectReportFloodRecordPages" resultMap="vo">
- SELECT R.*,atb."name" reservoirName FROM SM_REPORT_FLOOD_RECORD r
- LEFT JOIN "SJZT_MD"."att_res_base" atb on atb."guid" = r.reservoir_id
+ 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
- <if test="reportFloodRecord.adCode !=null and reportFloodRecord.adCode !=''">
- AND r.ad_code LIKE CONCAT('%',#{reportFloodRecord.adCode},'%')
+ <if test=" reportFloodRecord.adCode!= null and reportFloodRecord.adCode !='' ">
+ AND CONCAT(province."ad_code",city."ad_code",county."ad_code",town."ad_code") LIKE CONCAT('%',#{reportFloodRecord.adCode},'%')
</if>
<if test="reportFloodRecord.reservoirName != null and reportFloodRecord.reservoirName !=''">
- AND atb."name" LIKE CONCAT('%',#{reportFloodRecord.reservoirName},'%')
+ AND arb."name" LIKE CONCAT('%',#{reportFloodRecord.reservoirName},'%')
</if>
<if test="reportFloodRecord.isAudit != null and reportFloodRecord.isAudit !=''">
AND r.is_audit = #{reportFloodRecord.isAudit}
@@ -56,6 +99,18 @@
<if test="reportFloodRecord.createUser !=null and reportFloodRecord.createUser !=''">
AND r.create_user = #{reportFloodRecord.createUser}
</if>
+
+ <if test="reportFloodRecord.resRegCode != null and reportFloodRecord.resRegCode != ''">
+ AND arb."res_reg_code" LIKE CONCAT('%',#{reportFloodRecord.resRegCode},'%')
+ </if>
+ <if test="reportFloodRecord.reservoirId != null and reportFloodRecord.reservoirId != ''">
+ AND r.reservoir_id LIKE CONCAT('%',#{reportFloodRecord.reservoirId},'%')
+ </if>
+ <if test="reportFloodRecord.engScal != null and reportFloodRecord.engScal != ''">
+ AND arb."eng_scal" = #{reportFloodRecord.engScal}
+ </if>
+
+
ORDER BY CREATE_TIME DESC
</select>
<select id="customizeGetDetail" resultMap="vo">
@@ -69,8 +124,8 @@
</select>
<select id="getDetailVO" resultMap="vo">
- SELECT R.*,atb."name" reservoirName FROM SM_REPORT_FLOOD_RECORD r
- LEFT JOIN "SJZT_MD"."att_res_base" atb on atb."guid" = r.reservoir_id
+ SELECT R.*,arb."name" reservoirName FROM SM_REPORT_FLOOD_RECORD r
+ LEFT JOIN "SJZT_MD"."att_res_base" arb on arb."guid" = r.reservoir_id
WHERE r.is_deleted = 0 AND r.id = #{id}
</select>
</mapper>
--
Gitblit v1.9.3