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

1.修改运维管理-组织机构管理模块,查询组织和线路列表接口sql查询逻辑,解决出现重复组织问题;
2.修改运维管理-组织机构管理模块,查询组织机构分页列表接口sql查询逻辑,解决出现重复组织问题;
3.修改运维管理-基础信息配置-井口配置模块,查询井口分页列表接口查询逻辑,解决添加线路页选择关联井口时查到其它机构的井口问题;
4.修改运维管理-基础信息配置-柴发设备配置模块,查询柴发设备分页列表接口查询逻辑,解决添加线路页选择关联井口时查到其它机构的井口问题;
5.修改运维管理-基础信息配置-储能设备配置模块,查询储能设备分页列表接口查询逻辑,解决添加线路页选择关联井口时查到其它机构的井口问题;
6.修改运维管理-基础信息配置-光伏电站配置模块,查询光伏电站分页列表接口查询逻辑,解决添加线路页选择关联井口时查到其它机构的井口问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -374,8 +374,8 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
             List<SpaceOptimizeWellheadDTO> midWellheadDTOList = new ArrayList<>(64);
             List<SpaceOptimizeDurationDTO> midDurationDTOList = new ArrayList<>(128);
             List<SpaceOptimizeDurationDTO> midUnOptimizeDurationList = new ArrayList<>(128);
-            DateTime endOfMonth = DateUtil.endOfMonth(currentTime);
-            DateTime endOfWeek = DateUtil.endOfWeek(currentTime);
+            DateTime endOfMonth = DateUtil.endOfDay(DateUtil.endOfMonth(currentTime));
+            DateTime endOfWeek = DateUtil.endOfDay(DateUtil.endOfWeek(currentTime));
             String lineId = detail.getLineId();
             //取年份
             int year = currentTime.year();

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

@@ -62,7 +62,7 @@ public class SpaceOptimizeLongCloudServiceImpl extends SpaceOptimizeBaseService
         List<SpaceOptimizeDurationDTO> durationDTOList = new ArrayList<>(128);
         List<SpaceOptimizeDurationDTO> unOptimizeDurationList = new ArrayList<>(128);
         String executionCycleForMonth = BaseUtils.getExecutionCycleForMonth(date);
-        DateTime optimizeDeadline = DateUtil.endOfMonth(date);
+        DateTime optimizeDeadline = DateUtil.endOfDay(DateUtil.endOfMonth(date));
         //优化
         for (SpaceInstitutionDetailEnt detail : detailEntList) {
             //创建记录

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

@@ -54,7 +54,7 @@ public class SpaceOptimizeMidCloudServiceImpl extends SpaceOptimizeBaseService i
         List<SpaceOptimizeDurationDTO> unOptimizeDurationList = new ArrayList<>(128);
         String executionCycleForWeek = BaseUtils.getExecutionCycleForWeek(date);
         //优化截止日期
-        DateTime optimizeDeadline = DateUtil.endOfWeek(date);
+        DateTime optimizeDeadline = DateUtil.endOfDay(DateUtil.endOfWeek(date));
         //日期查询范围结束条件,下周一
         String nextWeek = DateUtil.beginOfWeek(DateUtil.nextWeek()).toString(BusinessConstant.DATE_FORMAT_DAY);
         //优化