Commit 6295ca16 authored by ZWT's avatar ZWT

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

1.修改间开制度管理--长期间开优化模块详情接口,优化已优化时间列表查询逻辑;
2.修改间开制度管理--中短期间开优化模块详情接口,优化已优化时间列表查询逻辑;
3.修改间开制度管理--定期校准模块重新校准接口,增加时间限制,超过优化时间不能优化;
4.修改间开制度管理--长期/中短期间开优化离网型算法,优化数据结构;
5.修改间开制度管理--设为基础制度及重新优化接口,解决部分数据没有默认值导致接口保存失败问题;
6.修改间开制度管理--间开制度详情接口,解决查询出其它井口问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent e143b0da
...@@ -191,16 +191,16 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -191,16 +191,16 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
.map(SpaceInstitutionWellheadEnt::getWellheadId) .map(SpaceInstitutionWellheadEnt::getWellheadId)
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
List<DynamicQueryBasePowerLineWellheadViewOutput> powerLineWellheadList = this.getPowerLineWellheadList(context, wellheadInput); // List<DynamicQueryBasePowerLineWellheadViewOutput> powerLineWellheadList = this.getPowerLineWellheadList(context, wellheadInput);
if (CollUtil.isNotEmpty(powerLineWellheadList)) { // if (CollUtil.isNotEmpty(powerLineWellheadList)) {
powerLineWellheadList.forEach(wellhead -> { // powerLineWellheadList.forEach(wellhead -> {
SpaceInstitutionWellheadEnt ent = new SpaceInstitutionWellheadEnt(); // SpaceInstitutionWellheadEnt ent = new SpaceInstitutionWellheadEnt();
ent.setWellheadId(wellhead.getWellheadId()); // ent.setWellheadId(wellhead.getWellheadId());
ent.setWellNumber(wellhead.getWellNumber()); // ent.setWellNumber(wellhead.getWellNumber());
ent.setRunTypeKey(wellhead.getRunTypeKey()); // ent.setRunTypeKey(wellhead.getRunTypeKey());
wellheadEntList.add(ent); // wellheadEntList.add(ent);
}); // });
} // }
if (CollUtil.isNotEmpty(wellheadEntList)) { if (CollUtil.isNotEmpty(wellheadEntList)) {
List<GetSpaceInstitutionWellheadViewOutput> wellheadViewOutputs = XCopyUtils.copyNewList(wellheadEntList, GetSpaceInstitutionWellheadViewOutput.class); List<GetSpaceInstitutionWellheadViewOutput> wellheadViewOutputs = XCopyUtils.copyNewList(wellheadEntList, GetSpaceInstitutionWellheadViewOutput.class);
Map<String, String> runTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.RUN_TYPE); Map<String, String> runTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.RUN_TYPE);
......
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