取消作业调整

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

@@ -2054,15 +2054,17 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 }
             }
 
-            //作业计划开工时间=所有作业明细最早计划开工时间
-            Optional<Date> minDate = apsProcessOperationProcessEquDos.stream()
-                    .map(ApsProcessOperationProcessEquDo::getPlanstartdate).min(Comparator.naturalOrder());
-            apsProcessOperationDo.setPlanstartdate(new Date(minDate.get().getTime()));
-
-            //作业计划完工时间=所有作业明细最晚计划完工时间
-            Optional<Date> maxDate = apsProcessOperationProcessEquDos.stream()
-                    .map(ApsProcessOperationProcessEquDo::getPlanenddate).max(Comparator.naturalOrder());
-            apsProcessOperationDo.setPlanenddate(new Date(maxDate.get().getTime()));
+            if (apsProcessOperationProcessEquDos.size() > 0) {
+                //作业计划开工时间=所有作业明细最早计划开工时间
+                Optional<Date> minDate = apsProcessOperationProcessEquDos.stream()
+                        .map(ApsProcessOperationProcessEquDo::getPlanstartdate).min(Comparator.naturalOrder());
+                apsProcessOperationDo.setPlanstartdate(new Date(minDate.get().getTime()));
+
+                //作业计划完工时间=所有作业明细最晚计划完工时间
+                Optional<Date> maxDate = apsProcessOperationProcessEquDos.stream()
+                        .map(ApsProcessOperationProcessEquDo::getPlanenddate).max(Comparator.naturalOrder());
+                apsProcessOperationDo.setPlanenddate(new Date(maxDate.get().getTime()));
+            }
 
             boolean bool1 = apsProcessOperationService.saveOrUpdate(apsProcessOperationDo);
             boolean bool2 = apsProcessOperationOutMaterService.saveOrUpdateBatch(apsProcessOperationOutMaterDoList);