Commit a3a92e47 authored by ZWT's avatar ZWT

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

1.修改间开制度管理--长期间开优化模块详情接口,优化已优化时间列表查询逻辑;
2.修改间开制度管理--中短期间开优化模块详情接口,优化已优化时间列表查询逻辑;
3.修改间开制度管理--定期校准模块重新校准接口,增加时间限制,超过优化时间不能优化;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 396839a7
...@@ -18,6 +18,7 @@ public enum BusinessError implements XError { ...@@ -18,6 +18,7 @@ public enum BusinessError implements XError {
UnableToOptimize(2106, "无法优化"), UnableToOptimize(2106, "无法优化"),
LackOfHistoryRecord(2107, "缺少历史记录"), LackOfHistoryRecord(2107, "缺少历史记录"),
CannotBeDeleted(2108, "基础制度无法删除"), CannotBeDeleted(2108, "基础制度无法删除"),
Expired(2109, "已过期,无法重新校准"),
; ;
private int code; private int code;
......
...@@ -341,7 +341,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -341,7 +341,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
public XServiceResult anewOptimizeInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) { public XServiceResult anewOptimizeInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) {
String historyId = input.getHistoryId(); String historyId = input.getHistoryId();
if (StringUtils.isEmpty(historyId)) { if (StringUtils.isEmpty(historyId)) {
return XServiceResult.error(context, XError.NotFound); return XServiceResult.error(context, BusinessError.LackOfHistoryRecord);
} }
PpsUserSession session = context.getSession(PpsUserSession.class); PpsUserSession session = context.getSession(PpsUserSession.class);
String institutionId = input.getId(); String institutionId = input.getId();
...@@ -350,6 +350,14 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -350,6 +350,14 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
if (Objects.isNull(detail)) { if (Objects.isNull(detail)) {
return XServiceResult.error(context, XError.NotFound); return XServiceResult.error(context, XError.NotFound);
} }
//查校准历史详情
SpaceCalibrationHistoryMapper historyMapper = context.getBean(SpaceCalibrationHistoryMapper.class);
SpaceCalibrationHistoryEnt historyEnt = historyMapper.selectById(historyId);
//过了校准日期不能再校准
Date calibrationDate = historyEnt.getCalibrationDate();
if (DateUtil.date().compareTo(calibrationDate) > 0) {
return XServiceResult.error(context, BusinessError.Expired);
}
return XTransactionHelper.begin(context, () -> { return XTransactionHelper.begin(context, () -> {
this.updateInstitutionDetail(context, session, mapper, institutionId, input, detail); this.updateInstitutionDetail(context, session, mapper, institutionId, input, detail);
//制度优化 //制度优化
......
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