From 83ef6a2b232a1f15d1bc2ba175a74216c5d8e857 Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Tue, 4 Aug 2026 16:42:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=82=B9=E5=87=BB=E5=AE=A1=E8=AE=A1?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=AF=84=E4=BB=B7-=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E4=B8=AD-=E6=9F=A5=E7=9C=8B=20=E4=B9=9F=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=88=96=E8=80=85=E9=A9=B3=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/Report/ReportProjectMapper.java           |  5 ++++-
 .../pojo/vo/entryWindow/EntryWindowVo.java           |  3 +++
 .../service/Report/ReportProjectService.java         |  3 ++-
 src/main/resources/mapper/ReportProjectMapper.xml    | 12 +++++++++++-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/mapper/Report/ReportProjectMapper.java b/src/main/java/com/biutag/supervision/mapper/Report/ReportProjectMapper.java
index 5e3bf7d..d794d82 100644
--- a/src/main/java/com/biutag/supervision/mapper/Report/ReportProjectMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/Report/ReportProjectMapper.java
@@ -22,7 +22,10 @@ public interface ReportProjectMapper extends BaseMapper<ReportProject> {
 
     Page<EntryWindowVo> queryPage(@Param("page") Page<ReportProject> page, @Param(Constants.WRAPPER) QueryWrapper<ReportProject> queryWrapper);
 
-    Page<EntryWindowVo> queryPageWarning(@Param("page") Page<ReportProject> page, @Param(Constants.WRAPPER) QueryWrapper<ReportProject> queryWrapper,String warningState);
+    Page<EntryWindowVo> queryPageWarning(@Param("page") Page<ReportProject> page,
+                                         @Param(Constants.WRAPPER) QueryWrapper<ReportProject> queryWrapper,
+                                         @Param("warningState") String warningState,
+                                         @Param("userId") String userId);
 
 
     Page<ConditionVo> queryPageCondition(@Param("page") Page<ReportProject> page,@Param(Constants.WRAPPER)QueryWrapper<ReportProject> queryWrapper);
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/entryWindow/EntryWindowVo.java b/src/main/java/com/biutag/supervision/pojo/vo/entryWindow/EntryWindowVo.java
index 4999199..2e7c2cc 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/entryWindow/EntryWindowVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/entryWindow/EntryWindowVo.java
@@ -16,6 +16,9 @@ public class EntryWindowVo extends ReportProject {
 
     private String warningId;
 
+    @Schema(description = "当前用户待审批的预警流程id")
+    private String flowId;
+
     private String warningState;
     //预警问题数
     private Long warningContent;
diff --git a/src/main/java/com/biutag/supervision/service/Report/ReportProjectService.java b/src/main/java/com/biutag/supervision/service/Report/ReportProjectService.java
index 528c6d9..3b299da 100644
--- a/src/main/java/com/biutag/supervision/service/Report/ReportProjectService.java
+++ b/src/main/java/com/biutag/supervision/service/Report/ReportProjectService.java
@@ -98,7 +98,8 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
     }
 
     public Page<EntryWindowVo> getPageWarning(Page<ReportProject> page, QueryWrapper<ReportProject> lambdaQueryWrapper, String warningState) {
-        return baseMapper.queryPageWarning(page, lambdaQueryWrapper, warningState);
+        UserAuth user = UserContextHolder.getCurrentUser();
+        return baseMapper.queryPageWarning(page, lambdaQueryWrapper, warningState, user.getUserName());
     }
 
     /**
diff --git a/src/main/resources/mapper/ReportProjectMapper.xml b/src/main/resources/mapper/ReportProjectMapper.xml
index 0f0123e..acdeae1 100644
--- a/src/main/resources/mapper/ReportProjectMapper.xml
+++ b/src/main/resources/mapper/ReportProjectMapper.xml
@@ -102,7 +102,17 @@
     </select>
 
     <select id="queryPageWarning" resultType="com.biutag.supervision.pojo.vo.entryWindow.EntryWindowVo">
-        SELECT p.*
+        SELECT p.*,
+               (
+                   SELECT f.id
+                   FROM report_flow f
+                   WHERE f.report_id = p.id
+                     AND f.type = 'warning'
+                     AND f.approver_state = 'start'
+                     AND f.approver_id = #{userId}
+                   ORDER BY f.areport_time DESC
+                   LIMIT 1
+               ) AS flowId
         FROM report_project p
         ${ew.getCustomSqlSegment}
         GROUP BY p.id