feat(吉林演示): 松原

1.开发间开优化结果统计功能,创建间开优化效果统计表,生成对应代码;
2.修改15天,10天,3天,1天间开优化功能,修改代码结构;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -3309,6 +3309,19 @@ public class SpaceOptimizeBaseService {
         if (CollUtil.isNotEmpty(optimizeDurationDTOList)) {
             //重新按开井时间排序
             optimizeDurationDTOList.sort(Comparator.comparing(SpaceOptimizeDurationDTO::getOpenTime));
+            //时间段优化
+            List<SpaceOptimizeDurationDTO> newDurationDTOList = new ArrayList<>(optimizeDurationDTOList.size());
+            newDurationDTOList.add(optimizeDurationDTOList.get(0));
+            for (int i = 1; i < optimizeDurationDTOList.size(); i++) {
+                SpaceOptimizeDurationDTO nowOne = optimizeDurationDTOList.get(i);
+                SpaceOptimizeDurationDTO lastOne = newDurationDTOList.get(newDurationDTOList.size() - 1);
+                if (0 == DateUtil.compare(lastOne.getCloseTime(), nowOne.getOpenTime())) {
+                    lastOne.setCloseTime(nowOne.getCloseTime());
+                } else {
+                    newDurationDTOList.add(nowOne);
+                }
+            }
+            optimizeDurationDTOList = newDurationDTOList;
             SpaceOptimizeDurationDTO durationDTO;
             for (int i1 = 0; i1 < optimizeDurationDTOList.size(); i1++) {
                 durationDTO = optimizeDurationDTOList.get(i1);