From 5e972eb9928c39b5abbdfd35e2a0aeff40876e7d Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 07 May 2024 17:23:16 +0800
Subject: [PATCH] 修改不成功问题
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 102 insertions(+), 18 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 518ad84..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
@@ -6,7 +6,6 @@
<result property="reservoirName" column="reservoirName"/>
<result property="updateTime" column="update_time"/>
<result property="content" column="content"/>
- <result property="solution" column="solution"/>
<result property="isDeleted" column="is_deleted"/>
<result property="status" column="status"/>
<result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
@@ -14,34 +13,119 @@
<result property="curDrp" column="cur_drp"/>
<result property="gateStatus" column="gate_status"/>
<result property="isOver" column="is_over"/>
- <result property="overZ" column="over_z"/>
- <result property="personWatch" column="person_watch"/>
- <result property="processDefinitionId" column="process_definition_id"/>
- <result property="processInstanceId" column="process_instance_id"/>
+ <result property="lkOverZ" column="lk_over_z"/>
+ <result property="lkRz" column="lk_rz"/>
+ <result property="wlwOverZ" column="wlw_over_z"/>
+ <result property="wlwRz" column="wlw_rz"/>
+ <result property="personOverZ" column="person_over_z"/>
+ <result property="personRz" column="person_rz"/>
+ <result property="adCode" column="ad_code"/>
+ <result property="isAudit" column="is_audit"/>
+
<result property="reservoirId" column="reservoir_id"/>
- <result property="sysReport" column="sys_report"/>
<result property="createDept" column="create_dept"/>
<result property="createUser" column="create_user"/>
<result property="updateUser" column="update_user"/>
<result property="createTime" column="create_time"/>
- <result property="handleContent" column="handleContent"/>
- <result property="handleImages" column="handleImages" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
- <result property="handleVideos" column="handleVideos" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
- <result property="handleSolution" column="handleSolution"/>
+
+ <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" resultType="cn.gistack.sm.reportFlood.entity.ReportFloodRecord">
+ <select id="selectReportFloodRecordPages" resultMap="vo">
+ 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 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 arb."name" LIKE CONCAT('%',#{reportFloodRecord.reservoirName},'%')
+ </if>
+ <if test="reportFloodRecord.isAudit != null and reportFloodRecord.isAudit !=''">
+ AND r.is_audit = #{reportFloodRecord.isAudit}
+ </if>
+ <if test="reportFloodRecord.reservoirId !=null and reportFloodRecord.reservoirId !=''">
+ AND r.reservoir_id = #{reportFloodRecord.reservoirId}
+ </if>
+ <if test="reportFloodRecord.startTime !=null and reportFloodRecord.startTime !=''">
+ AND DATE_FORMAT(r.create_time,'%Y-%m-%d') >= #{reportFloodRecord.startTime}
+ </if>
+ <if test="reportFloodRecord.endTime !=null and reportFloodRecord.endTime !=''">
+ AND DATE_FORMAT(r.create_time,'%Y-%m-%d') <= #{reportFloodRecord.endTime}
+ </if>
+ <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">
- SELECT R.*,atb."name" reservoirName,handle.content handleContent,handle.solution handleSolution,handle.images handleImages,handle.videos handleVideos FROM SM_REPORT_FLOOD_RECORD r
- LEFT JOIN "SJZT_MD"."att_res_base" atb ON atb."guid" = r.reservoir_id
- LEFT JOIN SM_REPORT_FLOOD_HANDLE handle ON handle.record_id = r.id
- WHERE r.IS_DELETED = 0 AND r.ID = #{reportFloodRecord.id}
- <if test="reportFloodRecord.currentUserId != null and reportFloodRecord.currentUserId !=''">
- AND handle.create_user = #{reportFloodRecord.currentUserId}
- </if>
+
+ </select>
+ <select id="getLatestRecord" resultType="cn.gistack.sm.reportFlood.entity.ReportFloodRecord">
+ SELECT * FROM SM_REPORT_FLOOD_RECORD
+ WHERE IS_DELETED = 0 AND IS_AUDIT = 20
+ AND reservoir_id = #{reservoirId}
+ ORDER BY UPDATE_TIME DESC LIMIT 1
+ </select>
+
+ <select id="getDetailVO" resultMap="vo">
+ 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