|
@@ -1219,7 +1219,7 @@ public class ReportController {
|
|
EstimateTimeSetting estimateTimeSetting = null;
|
|
EstimateTimeSetting estimateTimeSetting = null;
|
|
if(comTimeType.getProjectManDay()==1){
|
|
if(comTimeType.getProjectManDay()==1){
|
|
//剔除其中已通过的日报
|
|
//剔除其中已通过的日报
|
|
- List<Integer> filledReportIds = reportList.stream().filter(r->r.getId() != -1).map(Report::getId).collect(Collectors.toList());
|
|
|
|
|
|
+ List<Integer> filledReportIds = reportList.stream().filter(r->r.getId() != null).map(Report::getId).collect(Collectors.toList());
|
|
List<Report> targetCheckList = reportList;
|
|
List<Report> targetCheckList = reportList;
|
|
if (filledReportIds.size() > 0) {
|
|
if (filledReportIds.size() > 0) {
|
|
List<Report> passedReportList = reportMapper.selectList(new QueryWrapper<Report>().select("id").in("id", filledReportIds).eq("state", 1));
|
|
List<Report> passedReportList = reportMapper.selectList(new QueryWrapper<Report>().select("id").in("id", filledReportIds).eq("state", 1));
|