aps-开工和报工需要保存原计划开工和完工时间，开工的作业明细

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

@@ -1120,7 +1120,11 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             } else {
                 if (newLeaveWaitJobRoll == 0) {
                     processEquWrapper.set(ApsProcessOperationProcessEquDo::getClosestatus, "已完工");
-                    processEquWrapper.set(ApsProcessOperationProcessEquDo::getActualfinishdate, new Date());
+                    Date now = new Date();
+                    processEquWrapper.set(ApsProcessOperationProcessEquDo::getActualfinishdate, now);
+                    processEquWrapper.set(ApsProcessOperationProcessEquDo::getPlanstartdate, DateUtil.offsetMinute(now, (int) DateUtil.between(apsProcessOperationProcessEquDo.getPlanenddate(), apsProcessOperationProcessEquDo.getPlanstartdate(), DateUnit.MINUTE)));
+                    processEquWrapper.set(ApsProcessOperationProcessEquDo::getPlanenddate, now);
+
                 }
             }
             /**
@@ -1157,8 +1161,6 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             if (needReportRoll <= 0) {
                 needUpdateProcessOperation.setClosestatus("已完工");
                 needUpdateProcessOperation.setActualfinishdate(DateUtil.date());
-                needUpdateProcessOperation.setPlanstartdate(DateUtil.offsetMinute(needUpdateProcessOperation.getActualfinishdate(), (int) DateUtil.between(apsProcessOperationProcessEquDo.getPlanenddate(), apsProcessOperationProcessEquDo.getPlanstartdate(), DateUnit.MINUTE)));
-                needUpdateProcessOperation.setPlanenddate(needUpdateProcessOperation.getActualfinishdate());
                 needUpdateProcessOperation.setWorkstatus("已完工");
                 needUpdateProcessOperation.setProcessstatus(SaveConstans.ProductionStatus.COMPLETED);
             }