|
@@ -4839,7 +4839,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
});
|
|
|
//所有已填报的钢印号有任意满足 上面未填报工序集合 就算凑整件数
|
|
|
//找到所有可能填报了未填报其工序日报数据
|
|
|
- List<Report> comparatorReportList = targetReportList.stream().filter(r ->r.getSteelNumArray()!=null&&!JSONArray.parseArray(r.getSteelNumArray()).stream().anyMatch(a->integratedSteelNums.contains(a))&&r.getProdProcedureId()!=null && hasNotReportProdProduceIds.contains(r.getProdProcedureId())).collect(Collectors.toList());
|
|
|
+ List<Report> comparatorReportList = targetReportList.stream().filter(r ->r.getSteelNumArray()!=null&&JSONArray.parseArray(r.getSteelNumArray()).stream().anyMatch(a->!integratedSteelNums.contains(a))&&r.getProdProcedureId()!=null && hasNotReportProdProduceIds.contains(r.getProdProcedureId())).collect(Collectors.toList());
|
|
|
//过滤这些日报下的工序数据
|
|
|
List<Integer> targetComparator = comparatorReportList.stream().map(Report::getProdProcedureId).distinct().collect(Collectors.toList());
|
|
|
boolean match = targetComparator.containsAll(hasNotReportProdProduceIds);
|