Commit f53c9c57 authored by ZWT's avatar ZWT

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

1.修改基础信息配置--组织机构管理模块,通过组织机构ID查询下级组织机构及线路列表接口,增加查询线路类型逻辑,添加返回值,修改接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 29d4a8a7
...@@ -396,8 +396,9 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -396,8 +396,9 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
String institutionId = detail.getId(); String institutionId = detail.getId();
//取制度开始时间,判断是否可以执行 //取制度开始时间,判断是否可以执行
Date institutionStartDate = detail.getInstitutionStartDate(); Date institutionStartDate = detail.getInstitutionStartDate();
Date institutionEndDate = detail.getInstitutionEndDate();
DateTime currentTime = DateUtil.date(); DateTime currentTime = DateUtil.date();
if (currentTime.compareTo(institutionStartDate) >= 0) { if (currentTime.compareTo(institutionStartDate) >= 0 && currentTime.compareTo(institutionEndDate) <= 0) {
List<SpaceOptimizePeriodDTO> longPeriodDTOList = new ArrayList<>(32); List<SpaceOptimizePeriodDTO> longPeriodDTOList = new ArrayList<>(32);
List<SpaceOptimizeWellheadDTO> longWellheadDTOList = new ArrayList<>(64); List<SpaceOptimizeWellheadDTO> longWellheadDTOList = new ArrayList<>(64);
List<SpaceOptimizeDurationDTO> longDurationDTOList = new ArrayList<>(128); List<SpaceOptimizeDurationDTO> longDurationDTOList = new ArrayList<>(128);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment