|
@@ -229,8 +229,8 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
|
|
queryWrapper.in(Report::getType, reportVO.getTypes());
|
|
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) {
|
|
if (reportVO.getCronIds() != null && reportVO.getCronIds().size() > 0) {
|
|
StringBuilder strs = new StringBuilder();
|
|
StringBuilder strs = new StringBuilder();
|