|
@@ -2122,7 +2122,6 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
|
|
|
List<ApsProcessOperationProcessEquDo> list = apsProcessOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
|
|
|
.eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, apsProcessOperationProcessEquDo.getProcessdeviceid())
|
|
|
.eq(ApsProcessOperationProcessEquDo::getPlanstartdate, apsProcessOperationProcessEquDo.getPlanstartdate())
|
|
|
- .eq(ApsProcessOperationProcessEquDo::getProcessid, apsProcessOperationDo.getId())
|
|
|
.notIn(ApsProcessOperationProcessEquDo::getId, apsProcessOperationProcessEquDo.getId())
|
|
|
.and(qw -> qw.ge(ApsProcessOperationProcessEquDo::getActualfinishdate, apsReportRecordsDo.getReportworktime()).or().isNull(ApsProcessOperationProcessEquDo::getActualfinishdate)));
|
|
|
List<String> equIds = list.stream().map(ApsProcessOperationProcessEquDo::getId).collect(Collectors.toList());
|