From b176ddd3a9acdd1eef2e7eb9c0cef5fa620334b4 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 12 Jul 2023 16:03:53 +0800
Subject: [PATCH] 巡查逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml | 11 ++++++++++-
1 files changed, 10 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 a643b6e..363a65b 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
@@ -31,7 +31,7 @@
</resultMap>
- <select id="selectReportFloodRecordPages" resultType="cn.gistack.sm.reportFlood.vo.ReportFloodRecordVO">
+ <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
WHERE r.is_deleted = 0
@@ -53,6 +53,9 @@
<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>
ORDER BY CREATE_TIME DESC
</select>
<select id="customizeGetDetail" resultMap="vo">
@@ -64,4 +67,10 @@
AND reservoir_id = #{reservoirId}
ORDER BY UPDATE_TIME DESC LIMIT 1
</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
+ WHERE r.is_deleted = 0 AND r.id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3