From aa2004ef65a3d8c8e15ec1689fc4f8e1b8d91c59 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 24 Jan 2024 17:05:41 +0800
Subject: [PATCH] 巡检申报增加水库字段

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml |  206 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 186 insertions(+), 20 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml
index 76e7eff..cdfa8bd 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml
@@ -24,42 +24,208 @@
         </if>
         ORDER BY sdr.create_time DESC
     </select>
+    <select id="getRecordTimeData" resultType="cn.gistack.sm.jcsb.entity.DbReport">
+
+        SELECT * FROM SM_DB_REPORT
+        WHERE
+            is_deleted = 0
+          AND RESERVOIR_ID = #{entity.reservoirId}
+          AND type = #{entity.type}
+          AND station_id = #{entity.stationId}
+          AND DATE_FORMAT(record_time,'%Y-%m-%d') = DATE_FORMAT(#{entity.recordTime},'%Y-%m-%d')
+
+    </select>
+
     <select id="getDayList" resultType="cn.gistack.sm.jcsb.vo.DbReportVO">
 
     SELECT
         SDR.ID,SDR.RESERVOIR_NAME,
         SDR.RESERVOIR_ID,
         SDR.TYPE,
-        SDR.STATION_ID,acb.stationName,
+        SDR.STATION_ID,acb."cd_nm" as stationName,
         DATE_FORMAT(sdr.record_time,'%Y-%m-%d') AS record_time,
-        SDR.VAL,SDR.DE_VAL,SDR.DN_VAL,SDR.DU_VAL
+        DATE_FORMAT(sdr.record_time,'%Y-%m-%d') AS reportTime,
+        SDR.VAL
     FROM SM_DB_REPORT SDR
         LEFT JOIN SJZT_MD."att_cd_base" acb    ON acb."res_cd" = sdr.reservoir_id and acb."cd" = SDR.station_id
         WHERE SDR.IS_DELETED = 0
-    <if test="vo.type != null and vo.type != ''">
-        AND SDR.TYPE = #{vo.type}
-    </if>
-    <if test="db.startTime !=null and db.startTime !=''">
-        AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') &gt;= #{db.startTime}
-    </if>
-    <if test="db.endTime !=null and db.endTime !=''">
-        AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') &lt;= #{db.endTime}
-    </if>
+        <if test="vo.type != null and vo.type != ''">
+            AND SDR.TYPE = #{vo.type}
+            AND acb."cd_type" = #{vo.type}
+        </if>
+        <if test="vo.startTime !=null and vo.startTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') &gt;= DATE_FORMAT( #{vo.startTime},'%Y-%m-%d')
+        </if>
+        <if test="vo.endTime !=null and vo.endTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') &lt;=  DATE_FORMAT(#{vo.endTime},'%Y-%m-%d')
+        </if>
         <if test="vo.ch != null and vo.ch != ''">
             AND acb."ch" = #{vo.ch}
         </if>
-
+        <if test="vo.reservoirId != null and vo.reservoirId !='' ">
+            AND sdr.reservoir_id = #{vo.reservoirId}
+        </if>
+        ORDER BY reportTime ASC
 
     </select>
-    <select id="getRecordTimeData" resultType="cn.gistack.sm.jcsb.entity.DbReport">
+    <select id="getDayListWy" resultType="cn.gistack.sm.jcsb.vo.DbReportVO">
+        SELECT
+        SDR.ID,SDR.RESERVOIR_NAME,
+        SDR.RESERVOIR_ID,
+        SDR.TYPE,
+        SDR.STATION_ID,awcb."cd_nm" as stationName,
+        DATE_FORMAT(sdr.record_time,'%Y-%m-%d') AS record_time,
+        DATE_FORMAT(sdr.record_time,'%Y-%m-%d') AS reportTime,
+        SDR.VAL,SDR.DE_VAL,SDR.DN_VAL,SDR.DU_VAL
+        FROM SM_DB_REPORT SDR
+        LEFT JOIN SJZT_MD."att_wy_cd_base" awcb    ON awcb."res_cd" = sdr.reservoir_id and awcb."cd" = SDR.station_id
+        WHERE SDR.IS_DELETED = 0
+        <if test="vo.type != null and vo.type != ''">
+            AND SDR.TYPE = #{vo.type}
+            AND awcb."cd_type" = #{vo.type}
+        </if>
+        <if test="vo.startTime !=null and vo.startTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') &gt;= DATE_FORMAT( #{vo.startTime},'%Y-%m-%d')
+        </if>
+        <if test="vo.endTime !=null and vo.endTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') &lt;=  DATE_FORMAT(#{vo.endTime},'%Y-%m-%d')
+        </if>
+        <if test="vo.ch != null and vo.ch != ''">
+            AND awcb."ch" = #{vo.ch}
+        </if>
+        <if test="vo.reservoirId != null and vo.reservoirId !='' ">
+            AND sdr.reservoir_id = #{vo.reservoirId}
+        </if>
+        ORDER BY reportTime ASC
+    </select>
 
-        SELECT * FROM SM_DB_REPORT
-        WHERE
-            is_deleted = 0
-            AND RESERVOIR_ID = #{entity.reservoirId}
-            AND type = #{entity.type}
-            AND station_id = #{entity.stationId}
-            AND DATE_FORMAT(record_time,'%Y-%m-%d') = DATE_FORMAT(#{entity.recordTime},'%Y-%m-%d')
+    <select id="getMonthList" resultType="cn.gistack.sm.jcsb.vo.DbReportVO">
+        SELECT
+        SDR.RESERVOIR_NAME,
+        SDR.RESERVOIR_ID,
+        SDR.TYPE,
+        SDR.STATION_ID,
+        acb."cd_nm" as stationName,
+            DATE_FORMAT(SDR.RECORD_TIME,'%Y-%m') as reportTime,
+            AVG(SDR.val) as val
+        FROM SM_DB_REPORT SDR
+        LEFT JOIN SJZT_MD."att_cd_base" acb    ON acb."res_cd" = sdr.reservoir_id and acb."cd" = SDR.station_id
+        WHERE SDR.is_deleted = 0
+        <if test="vo.type != null and vo.type != ''">
+            AND  SDR.TYPE = #{vo.type}
+            AND acb."cd_type" = #{vo.type}
+        </if>
+        <if test="vo.startTime !=null and vo.startTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y-%m') &gt;=  DATE_FORMAT(#{vo.startTime} ,'%Y-%m')
+        </if>
+        <if test="vo.endTime !=null and vo.endTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y-%m') &lt;=  DATE_FORMAT(#{vo.endTime} ,'%Y-%m')
+        </if>
+        <if test="vo.ch != null and vo.ch != ''">
+            AND acb."ch" = #{vo.ch}
+        </if>
+        <if test="vo.reservoirId != null and vo.reservoirId !='' ">
+            AND sdr.reservoir_id = #{vo.reservoirId}
+        </if>
+        GROUP BY RESERVOIR_NAME,RESERVOIR_ID,TYPE,STATION_ID,acb."cd_nm",DATE_FORMAT(RECORD_TIME,'%Y-%m')
+        ORDER BY reportTime ASC
+    </select>
+    <select id="getMonthListWy" resultType="cn.gistack.sm.jcsb.vo.DbReportVO">
+        SELECT
+        SDR.RESERVOIR_NAME,
+        SDR.RESERVOIR_ID,
+        SDR.TYPE,
+        SDR.STATION_ID,
+        awcb."cd_nm" as stationName,
+        DATE_FORMAT(SDR.RECORD_TIME,'%Y-%m') as reportTime,
+        AVG(SDR.de_val) as deVal,
+        AVG(SDR.dn_val) as dnVal,
+        AVG(SDR.du_val) as duVal
+        FROM SM_DB_REPORT SDR
+        LEFT JOIN SJZT_MD."att_wy_cd_base" awcb    ON awcb."res_cd" = sdr.reservoir_id and awcb."cd" = SDR.station_id
+        WHERE SDR.is_deleted = 0
+        <if test="vo.type != null and vo.type != ''">
+            AND  SDR.TYPE = #{vo.type}
+            AND awcb."cd_type" = #{vo.type}
+        </if>
+        <if test="vo.startTime !=null and vo.startTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y-%m') &gt;=  DATE_FORMAT(#{vo.startTime} ,'%Y-%m')
+        </if>
+        <if test="vo.endTime !=null and vo.endTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y-%m') &lt;=  DATE_FORMAT(#{vo.endTime} ,'%Y-%m')
+        </if>
+        <if test="vo.ch != null and vo.ch != ''">
+            AND awcb."ch" = #{vo.ch}
+        </if>
+        <if test="vo.reservoirId != null and vo.reservoirId !='' ">
+            AND sdr.reservoir_id = #{vo.reservoirId}
+        </if>
+        GROUP BY RESERVOIR_NAME,RESERVOIR_ID,TYPE,STATION_ID,awcb."cd_nm",DATE_FORMAT(RECORD_TIME,'%Y-%m')
+        ORDER BY reportTime ASC
+    </select>
 
+    <select id="getYearList" resultType="cn.gistack.sm.jcsb.vo.DbReportVO">
+        SELECT
+        SDR.RESERVOIR_NAME,
+        SDR.RESERVOIR_ID,
+        SDR.TYPE,
+        SDR.STATION_ID,
+        acb."cd_nm" as stationName,
+        DATE_FORMAT(SDR.RECORD_TIME,'%Y') as reportTime,
+        AVG(SDR.val) as val
+        FROM SM_DB_REPORT SDR
+        LEFT JOIN SJZT_MD."att_cd_base" acb    ON acb."res_cd" = sdr.reservoir_id and acb."cd" = SDR.station_id
+        WHERE SDR.is_deleted = 0
+        <if test="vo.type != null and vo.type != ''">
+            AND  SDR.TYPE = #{vo.type}
+            AND acb."cd_type" = #{vo.type}
+        </if>
+        <if test="vo.startTime !=null and vo.startTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y') &gt;=  DATE_FORMAT(#{vo.startTime} ,'%Y')
+        </if>
+        <if test="vo.endTime !=null and vo.endTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y') &lt;=  DATE_FORMAT(#{vo.endTime} ,'%Y')
+        </if>
+        <if test="vo.ch != null and vo.ch != ''">
+            AND acb."ch" = #{vo.ch}
+        </if>
+        <if test="vo.reservoirId != null and vo.reservoirId !='' ">
+            AND sdr.reservoir_id = #{vo.reservoirId}
+        </if>
+        GROUP BY RESERVOIR_NAME,RESERVOIR_ID,TYPE,STATION_ID,acb."cd_nm",DATE_FORMAT(RECORD_TIME,'%Y')
+        ORDER BY reportTime ASC
+    </select>
+    <select id="getYearListWy" resultType="cn.gistack.sm.jcsb.vo.DbReportVO">
+        SELECT
+        SDR.RESERVOIR_NAME,
+        SDR.RESERVOIR_ID,
+        SDR.TYPE,
+        SDR.STATION_ID,
+        awcb."cd_nm" as stationName,
+        DATE_FORMAT(SDR.RECORD_TIME,'%Y') as reportTime,
+        AVG(SDR.de_val) as deVal,
+        AVG(SDR.dn_val) as dnVal,
+        AVG(SDR.du_val) as duVal
+        FROM SM_DB_REPORT SDR
+        LEFT JOIN SJZT_MD."att_wy_cd_base" awcb    ON awcb."res_cd" = sdr.reservoir_id and awcb."cd" = SDR.station_id
+        WHERE SDR.is_deleted = 0
+        <if test="vo.type != null and vo.type != ''">
+            AND  SDR.TYPE = #{vo.type}
+            AND awcb."cd_type" = #{vo.type}
+        </if>
+        <if test="vo.startTime !=null and vo.startTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y') &gt;=  DATE_FORMAT(#{vo.startTime} ,'%Y')
+        </if>
+        <if test="vo.endTime !=null and vo.endTime !=''">
+            AND DATE_FORMAT(sdr.record_time,'%Y') &lt;=  DATE_FORMAT(#{vo.endTime} ,'%Y')
+        </if>
+        <if test="vo.ch != null and vo.ch != ''">
+            AND awcb."ch" = #{vo.ch}
+        </if>
+        <if test="vo.reservoirId != null and vo.reservoirId !='' ">
+            AND sdr.reservoir_id = #{vo.reservoirId}
+        </if>
+        GROUP BY RESERVOIR_NAME,RESERVOIR_ID,TYPE,STATION_ID,awcb."cd_nm",DATE_FORMAT(RECORD_TIME,'%Y')
+        ORDER BY reportTime ASC
     </select>
 </mapper>

--
Gitblit v1.9.3