From b397edee2be2dfcc3f28eeac50298b4de26b1afa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 十二月 2024 16:53:45 +0800
Subject: [PATCH] 取水口日取水量表中,出现一些大数,明显不正确,发析系统日志,发现一些阀控器会上报一些累计流量为0的数据,且无规律,推测是其不能从水表读取到累计流量时会上报0值。如果间歇上报0值,间歇上报一些非0值,非0值减去0值,就会出现大数,一天中出现几次那么会大数进行累加,数值将更大。为此变更算法,规避这种情况,但也会丢失一些流量值。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
index e3609d8..9e2323e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeIssueReportMapper.xml
@@ -203,7 +203,7 @@
   </select>
 
   <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇宸℃鍛橀棶棰樹笂鎶�-->
-  <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voOp.VoIssueReport">
+  <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voOp.VoIssueReport_temp">
     SELECT
         rpt.id AS issueReportId,
         us.name AS inspectorName,
@@ -214,6 +214,8 @@
         rpt.audios,
         rpt.videos,
         rpy.reply_time AS replyTime,
+        rpy.reply_content AS replyContent,
+        rpy.replier_id AS replyPersonId,
         rpt.state AS stateId,
         CASE
             WHEN rpt.state = 1 THEN '鏈彈鐞�'
@@ -252,4 +254,38 @@
       </if>
     </trim>
   </select>
+
+  <!--鏍规嵁涓婃姤ID鍙婂贰妫�鍛業D鑾峰彇鏈垹闄ょ殑涓婃姤锛屽垹闄や笂鎶ュ垽鏂娇鐢�-->
+  <select id="getReport" resultType="com.dy.pipIrrGlobal.pojoOp.OpeIssueReport">
+    SELECT * FROM ope_issue_report WHERE state != 3 AND id = #{issueReportId} AND inspector_id = #{inspectorId}
+  </select>
+
+  <!--閫昏緫鍒犻櫎涓�涓啘鎴烽棶棰樹笂鎶�-->
+  <update id="deleteIssueReport">
+    UPDATE ope_issue_report SET state = 3 WHERE id = #{issueReportId}
+  </update>
+  <!--鏍规嵁闂涓婃姤璁板綍涓婚敭鑾峰彇鑾峰彇宸℃鍛橀棶棰樹笂鎶ヨ褰曡鍥惧璞�-->
+  <select id="getIssueReportById" resultType="com.dy.pipIrrGlobal.voOp.VoIssueReport_temp">
+    SELECT
+      rpt.id AS issueReportId,
+      us.name AS inspectorName,
+      rpt.phone,
+      rpt.report_time AS reportTime,
+      rpt.content,
+      rpt.images,
+      rpt.audios,
+      rpt.videos,
+      rpy.reply_time AS replyTime,
+      rpy.reply_content AS replyContent,
+      rpy.replier_id AS replyPersonId,
+      rpt.state AS stateId,
+      CASE
+        WHEN rpt.state = 1 THEN '鏈彈鐞�'
+        WHEN rpt.state = 2 THEN '宸插彈鐞�'
+        END AS state
+    FROM ope_issue_report rpt
+           LEFT JOIN ba_user us ON us.id = rpt.inspector_id
+           LEFT JOIN ope_report_reply rpy ON rpy.report_id = rpt.id
+    where rpt.state != 3 AND rpt.id = #{issueReportId}
+  </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0