feat(吉林演示): 松原

1.解决各时段间开优化功能执行异常导致未执行间开优化问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeBaseService.java

@@ -330,6 +330,9 @@ public class SpaceOptimizeBaseService {
                         String wellheadId = wellhead.getWellheadId();
                         String recordId = this.createOptimizeWellhead(wellheadDTOList, periodId, wellheadId, wellhead.getWellNumber(), wellhead.getStartSeq(), recordTime, BusinessConstant.ONE);
                         //保存间开原始记录
+                        if (!durationMap.containsKey(detail.getId()) || !durationMap.get(detail.getId()).containsKey(wellheadId)) {
+                            continue;
+                        }
                         for (SpaceInstitutionDurationEnt durationEnt : durationMap.get(detail.getId()).get(wellheadId)) {
                             this.createUnOptimizeDuration(unOptimizeDurationList, durationEnt, periodId, recordId, wellheadId, recordTime);
                         }
@@ -2209,7 +2212,7 @@ public class SpaceOptimizeBaseService {
             long duration = weightDuration.getDuration();
             DateTime openTime = weightDuration.getOpenTime();
             //偏移其他井口开井时间,并修改时间间隔
-            if (i > 0 && 0 == i1 && 0 >= openTime.compareTo(firstOpenWellTime)) {
+            if (i > 0 && 0 == i1 && 0 >= DateUtil.compare(openTime, firstOpenWellTime)) {
                 duration -= (long) startInterval * i;
                 openTime = DateUtil.offsetMinute(openTime, startInterval * i);
             }
@@ -2393,7 +2396,7 @@ public class SpaceOptimizeBaseService {
             }
         }
         //判断是否需要补时间
-        if (sumOpenTime < dayOpenMinute) {
+        if (sumOpenTime < dayOpenMinute && CollUtil.isNotEmpty(weightList)) {
             //创建需要补时间的时间范围
             List<SpaceOptimizeWeightDuration> replenishList = new ArrayList<>(12);
             //得到开始时间时间戳