|
@@ -2121,7 +2121,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
|
|
|
if ("合并加工".equals(apsProcessOperationDo.getProcessway())) {
|
|
|
List<ApsProcessOperationProcessEquDo> list = apsProcessOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
|
|
|
.eq(ApsProcessOperationProcessEquDo::getProcessdeviceid, apsProcessOperationProcessEquDo.getProcessdeviceid())
|
|
|
- .eq(ApsProcessOperationProcessEquDo::getOldplanstartdate, apsProcessOperationProcessEquDo.getOldplanstartdate())
|
|
|
+ .eq(ApsProcessOperationProcessEquDo::getPlanstartdate, apsReportRecordsDo.getStartworktime())
|
|
|
.eq(ApsProcessOperationProcessEquDo::getProcessid, apsProcessOperationDo.getId())
|
|
|
.notIn(ApsProcessOperationProcessEquDo::getId, apsReportRecordsDo.getProcessequid())
|
|
|
.and(qw -> qw.gt(ApsProcessOperationProcessEquDo::getActualfinishdate, apsProcessOperationProcessEquDo.getActualstartdate()).or().isNull(ApsProcessOperationProcessEquDo::getActualfinishdate)));
|