Commit ef46a69d authored by ZWT's avatar ZWT

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

1.修改间开制度管理-长期/中长期间开优化定时任务,解决未设置区间的井口不展示时间区间问题;
2.开发间开制度管理-校准周期模块,间开制度跟踪接口,完成接口冒烟测试,并生成接口文档;
3.修改间开制度管理-短期间开模块,短期间开制度详情接口,解决井口间开时间段展示异常问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent b6ce14f7
...@@ -261,7 +261,7 @@ public class SpaceCalibrationService { ...@@ -261,7 +261,7 @@ public class SpaceCalibrationService {
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE) .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.eq(SpaceOptimizeShortDurationEnt::getWellheadId, input.getWellheadId()) .eq(SpaceOptimizeShortDurationEnt::getWellheadId, input.getWellheadId())
.eq(SpaceOptimizeShortDurationEnt::getShortPeriodId, shortPeriodEnt.getId()) .eq(SpaceOptimizeShortDurationEnt::getShortPeriodId, shortPeriodEnt.getId())
.orderByAsc(BaseModel::getCreateTime) .orderByAsc(SpaceOptimizeShortDurationEnt::getOpenWellTime)
); );
if (CollUtil.isNotEmpty(shortDurationEntList)) { if (CollUtil.isNotEmpty(shortDurationEntList)) {
Map<Integer, List<SpaceOptimizeDateDuration>> collect = XCopyUtils.copyNewList(shortDurationEntList, SpaceOptimizeDateDuration.class) Map<Integer, List<SpaceOptimizeDateDuration>> collect = XCopyUtils.copyNewList(shortDurationEntList, SpaceOptimizeDateDuration.class)
...@@ -286,7 +286,7 @@ public class SpaceCalibrationService { ...@@ -286,7 +286,7 @@ public class SpaceCalibrationService {
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE) .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.eq(SpaceOptimizeMidDurationEnt::getWellheadId, input.getWellheadId()) .eq(SpaceOptimizeMidDurationEnt::getWellheadId, input.getWellheadId())
.eq(SpaceOptimizeMidDurationEnt::getMidPeriodId, midPeriodEnt.getId()) .eq(SpaceOptimizeMidDurationEnt::getMidPeriodId, midPeriodEnt.getId())
.orderByAsc(BaseModel::getCreateTime) .orderByAsc(SpaceOptimizeMidDurationEnt::getOpenWellTime)
); );
if (CollUtil.isNotEmpty(midDurationEntList)) { if (CollUtil.isNotEmpty(midDurationEntList)) {
Map<Integer, List<SpaceOptimizeDateDuration>> collect = XCopyUtils.copyNewList(midDurationEntList, SpaceOptimizeDateDuration.class) Map<Integer, List<SpaceOptimizeDateDuration>> collect = XCopyUtils.copyNewList(midDurationEntList, SpaceOptimizeDateDuration.class)
......
...@@ -153,7 +153,7 @@ public class SpaceOptimizeShortCloudServiceImpl extends SpaceOptimizeBaseService ...@@ -153,7 +153,7 @@ public class SpaceOptimizeShortCloudServiceImpl extends SpaceOptimizeBaseService
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE) .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.eq(SpaceOptimizeMidDurationEnt::getIsOptimize, BusinessConstant.ZERO) .eq(SpaceOptimizeMidDurationEnt::getIsOptimize, BusinessConstant.ZERO)
.eq(SpaceOptimizeMidDurationEnt::getMidPeriodId, midPeriodEnt.getId()) .eq(SpaceOptimizeMidDurationEnt::getMidPeriodId, midPeriodEnt.getId())
.orderByAsc(BaseModel::getCreateTime) .orderByAsc(SpaceOptimizeMidDurationEnt::getOpenWellTime)
); );
if (CollUtil.isNotEmpty(optimizeMidDurationEntList)) { if (CollUtil.isNotEmpty(optimizeMidDurationEntList)) {
optimizeMidDurationMap = optimizeMidDurationEntList.stream() optimizeMidDurationMap = optimizeMidDurationEntList.stream()
......
...@@ -69,7 +69,7 @@ public class SpaceOptimizeShortPeriodService { ...@@ -69,7 +69,7 @@ public class SpaceOptimizeShortPeriodService {
List<SpaceInstitutionWellheadEnt> wellheadEntList = wellheadMapper.selectList(new LambdaQueryWrapper<SpaceInstitutionWellheadEnt>() List<SpaceInstitutionWellheadEnt> wellheadEntList = wellheadMapper.selectList(new LambdaQueryWrapper<SpaceInstitutionWellheadEnt>()
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE) .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.eq(SpaceInstitutionWellheadEnt::getInstitutionId, institutionId) .eq(SpaceInstitutionWellheadEnt::getInstitutionId, institutionId)
.orderByAsc(BaseModel::getCreateTime) .orderByAsc(SpaceInstitutionWellheadEnt::getStartSeq)
); );
if (CollUtil.isEmpty(wellheadEntList)) { if (CollUtil.isEmpty(wellheadEntList)) {
//缺少井口 //缺少井口
......
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