Selaa lähdekoodia

Merge branch 'mode-min-unit' into mode-min-unit-交期偏差

sucheng 2 kuukautta sitten
vanhempi
commit
b75877c840

+ 0 - 1
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -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());