From f8b4d4972a16ccc11c9e601d0fdff4c8d792b4b9 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Thu, 12 Mar 2026 11:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gunshi/project/ss/entity/vo/StFlowRLatestVo.java  | 3 +++
 .../java/com/gunshi/project/ss/service/StFlowRService.java     | 2 ++
 .../com/gunshi/project/ss/service/WarningRuleInfoService.java  | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gunshi/project/ss/entity/vo/StFlowRLatestVo.java b/src/main/java/com/gunshi/project/ss/entity/vo/StFlowRLatestVo.java
index 204463d..8cf13a5 100644
--- a/src/main/java/com/gunshi/project/ss/entity/vo/StFlowRLatestVo.java
+++ b/src/main/java/com/gunshi/project/ss/entity/vo/StFlowRLatestVo.java
@@ -40,4 +40,7 @@ public class StFlowRLatestVo {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime tm;
+
+    private BigDecimal lgtd;
+    private BigDecimal lttd;
 }
diff --git a/src/main/java/com/gunshi/project/ss/service/StFlowRService.java b/src/main/java/com/gunshi/project/ss/service/StFlowRService.java
index 7a6f8b6..2bb1d2d 100644
--- a/src/main/java/com/gunshi/project/ss/service/StFlowRService.java
+++ b/src/main/java/com/gunshi/project/ss/service/StFlowRService.java
@@ -74,6 +74,8 @@ public class StFlowRService extends ServiceImpl<StFlowRMapper, StFlowR> {
             StFlowRLatestVo vo = new StFlowRLatestVo();
             vo.setStcd(flowStation.getStcd());
             vo.setStnm(flowStation.getStnm());
+            vo.setLgtd(flowStation.getLgtd());
+            vo.setLttd(flowStation.getLttd());
 
             List<StFlowR> list = lambdaQuery()
                     .eq(StFlowR::getStcd, vo.getStcd())
diff --git a/src/main/java/com/gunshi/project/ss/service/WarningRuleInfoService.java b/src/main/java/com/gunshi/project/ss/service/WarningRuleInfoService.java
index dbefa2b..7c00951 100644
--- a/src/main/java/com/gunshi/project/ss/service/WarningRuleInfoService.java
+++ b/src/main/java/com/gunshi/project/ss/service/WarningRuleInfoService.java
@@ -101,7 +101,7 @@ public class WarningRuleInfoService extends ServiceImpl<WarningRuleInfoMapper,Wa
             }
             info.setFirstAuditStatus(dto.getStatus());
             info.setFirstAuditTime(LocalDateTime.now());
-            if (info.getSecondAuditUserId() == null){
+            if (info.getSecondAuditUserId() == null || dto.getStatus() == 9){
                 info.setStatus(dto.getStatus());
             }
         }