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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

 package pps.core.space.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -95,7 +96,6 @@ public class SpaceOptimizeMidPeriodService extends SpaceOptimizeBaseService {
             return XSingleResult.error(context, XError.NotFound);
         }
         GetSpaceOptimizeMidPeriodViewOutput output = XCopyUtils.copyNewObject(period, GetSpaceOptimizeMidPeriodViewOutput.class);
-        output.setDateList(ServiceUtil.getOptimizeDateList(period.getCreateTime(), period.getOptimizeDeadline()));
         //查间开制度详情
         SpaceInstitutionDetailMapper detailMapper = context.getBean(SpaceInstitutionDetailMapper.class);
         SpaceInstitutionDetailEnt detailEnt = detailMapper.selectById(period.getInstitutionId());
@@ -111,6 +111,11 @@ public class SpaceOptimizeMidPeriodService extends SpaceOptimizeBaseService {
         } else {
             output.setStrategyDetailList(new ArrayList<>(0));
         }
+        DateTime beginOfWeek = DateUtil.beginOfWeek(period.getOptimizeDeadline());
+        if (beginOfWeek.compareTo(detailEnt.getInstitutionStartDate()) < 0) {
+            beginOfWeek = DateUtil.date(detailEnt.getInstitutionStartDate());
+        }
+        output.setDateList(ServiceUtil.getOptimizeDateList(beginOfWeek, period.getOptimizeDeadline()));
         output.setGridTypeKey(detailEnt.getGridTypeKey());
         //查井口列表
         SpaceOptimizeMidWellheadMapper wellheadMapper = context.getBean(SpaceOptimizeMidWellheadMapper.class);