feat: 点击审计质量评价-预警中-查看 也可以通过或者驳回

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);

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;

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());
     }
 
     /**

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