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 { Page queryPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); - Page queryPageWarning(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper,String warningState); + Page queryPageWarning(@Param("page") Page page, + @Param(Constants.WRAPPER) QueryWrapper queryWrapper, + @Param("warningState") String warningState, + @Param("userId") String userId); Page queryPageCondition(@Param("page") Page page,@Param(Constants.WRAPPER)QueryWrapper 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 getPageWarning(Page page, QueryWrapper 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 @@