lwhhszx пре 2 година
родитељ
комит
cd3ad8ff5d

+ 2 - 0
RMS/src/main/java/cn/cslg/report/common/model/vo/ReportVO.java

@@ -137,4 +137,6 @@ public class ReportVO extends BaseVO {
     private List<Integer> scenarioList;
 
     private List<String> types;
+    @Schema(description = "状态集合")
+    private List<Integer> Statuses;
 }

+ 2 - 2
RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -229,8 +229,8 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
             queryWrapper.in(Report::getType, reportVO.getTypes());
         }
         //根据状态查询报告
-        if(reportVO.getStatus()!=null){
-            queryWrapper.eq(Report::getStatus,reportVO.getStatus());
+        if(reportVO.getStatuses()!=null&&reportVO.getStatuses().size()>0){
+            queryWrapper.in(Report::getStatus,reportVO.getStatuses());
         }
         if (reportVO.getCronIds() != null && reportVO.getCronIds().size() > 0) {
             StringBuilder strs = new StringBuilder();