From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划,是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml
index 8e8c84f..79c4fe8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeIssueReportMapper.xml
@@ -175,6 +175,7 @@
     SELECT COUNT(*) AS recordCount
     FROM se_issue_report rpt
         LEFT JOIN se_client cli ON cli.id = rpt.client_id
+        LEFT JOIN se_report_reply rpy ON rpy.report_id = rpt.id
     <where>
       AND rpt.state != 3
 
@@ -201,7 +202,7 @@
   </select>
 
   <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛闂涓婃姤-->
-  <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voSe.VoIssueReport" >
+  <select id="getIssueReports" resultType="com.dy.pipIrrGlobal.voSe.VoIssueReport_temp" >
     SELECT
         rpt.id AS issueReportId,
         cli.name AS clientName,
@@ -211,12 +212,15 @@
         rpt.images,
         rpt.audios,
         rpt.videos,
+        rpy.reply_time AS replyTime,
+        rpt.state AS stateId,
         CASE
             WHEN rpt.state = 1 THEN '鏈彈鐞�'
             WHEN rpt.state = 2 THEN '宸插彈鐞�'
         END AS state
     FROM se_issue_report rpt
         LEFT JOIN se_client cli ON cli.id = rpt.client_id
+        LEFT JOIN se_report_reply rpy ON rpy.report_id = rpt.id
     <where>
       AND rpt.state != 3
 
@@ -248,6 +252,11 @@
     </trim>
   </select>
 
+  <!--鏍规嵁涓婃姤ID鍙婂啘鎴稩D鑾峰彇鏈垹闄ょ殑涓婃姤锛屽垹闄や笂鎶ュ垽鏂娇鐢�-->
+  <select id="getReport" resultType="com.dy.pipIrrGlobal.pojoSe.SeIssueReport">
+    SELECT * FROM se_issue_report WHERE state != 3 AND id = #{issueReportId} AND client_id = #{clientId}
+  </select>
+
   <!--閫昏緫鍒犻櫎涓�涓啘鎴烽棶棰樹笂鎶�-->
   <update id="deleteIssueReport">
     UPDATE se_issue_report SET state = 3 WHERE id = #{issueReportId}

--
Gitblit v1.8.0