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/reportFlood/mapper/ReportFloodRecordMapper.xml | 58 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 19 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..a643b6e 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,55 @@
<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"/>
</resultMap>
- <select id="selectReportFloodRecordPages" resultType="cn.gistack.sm.reportFlood.entity.ReportFloodRecord">
-
+ <select id="selectReportFloodRecordPages" resultType="cn.gistack.sm.reportFlood.vo.ReportFloodRecordVO">
+ 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
+ WHERE r.is_deleted = 0
+ <if test="reportFloodRecord.adCode !=null and reportFloodRecord.adCode !=''">
+ AND r.ad_code LIKE CONCAT('%',#{reportFloodRecord.adCode},'%')
+ </if>
+ <if test="reportFloodRecord.reservoirName != null and reportFloodRecord.reservoirName !=''">
+ AND atb."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>
+ 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>
</mapper>
--
Gitblit v1.9.3