feat(能源管理系统): 测试问题修复

1.修改间开制度管理--长期间开优化模块详情接口,优化已优化时间列表查询逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -97,7 +97,6 @@ public class SpaceOptimizeLongPeriodService extends SpaceOptimizeBaseService {
             return XSingleResult.error(context, XError.NotFound);
         }
         GetSpaceOptimizeLongPeriodViewOutput output = XCopyUtils.copyNewObject(period, GetSpaceOptimizeLongPeriodViewOutput.class);
-        output.setDateList(ServiceUtil.getOptimizeDateList(period.getCreateTime(), period.getOptimizeDeadline()));
         //查间开制度详情
         SpaceInstitutionDetailMapper detailMapper = context.getBean(SpaceInstitutionDetailMapper.class);
         SpaceInstitutionDetailEnt detailEnt = detailMapper.selectById(period.getInstitutionId());
@@ -113,6 +112,11 @@ public class SpaceOptimizeLongPeriodService extends SpaceOptimizeBaseService {
         } else {
             output.setStrategyDetailList(new ArrayList<>(0));
         }
+        DateTime beginOfMonth = DateUtil.beginOfMonth(period.getOptimizeDeadline());
+        if (beginOfMonth.compareTo(detailEnt.getInstitutionStartDate()) < 0) {
+            beginOfMonth = DateUtil.date(detailEnt.getInstitutionStartDate());
+        }
+        output.setDateList(ServiceUtil.getOptimizeDateList(beginOfMonth, period.getOptimizeDeadline()));
         output.setGridTypeKey(detailEnt.getGridTypeKey());
         //查井口列表
         SpaceOptimizeLongWellheadMapper wellheadMapper = context.getBean(SpaceOptimizeLongWellheadMapper.class);