Commit 7acce0dc authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.系统管理模块,查询线路及组织机构树接口修改,增加查询逻辑,通过线路名称模糊查询树列表,完成接口冒烟测试并同步线上接口文档;
2.系统管理模块,查询光伏电站及组织机构树接口修改,增加查询逻辑,通过电站名称模糊查询树列表,完成接口冒烟测试并同步线上接口文档;
3.基础信息配置模块,新增市电峰谷导入模板下载接口,完成接口冒烟测试并同步线上接口文档;
4.基础信息配置模块,市电峰谷模板下载接口修改,增加多选月份导出配置数据逻辑,修改线上接口文档并完成接口冒烟测试;
5.基础信息配置模块,新增市电峰谷数据导入接口,增加导入数据校验逻辑,完成接口冒烟测试并添加线上接口文档;
6.基础间开配置模块,新增编辑制度模板导出接口,添加线上接口文档并完成接口冒烟测试;
7.基础间开配置模块,新增编制制度导入接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent add28c90
...@@ -103,10 +103,10 @@ public class ExcelService { ...@@ -103,10 +103,10 @@ public class ExcelService {
if (CollUtil.isNotEmpty(errorRowList)) { if (CollUtil.isNotEmpty(errorRowList)) {
throw new XServiceException("第[" + CollUtil.join(errorRowList, ",") + "]行,开始或结束时间输入错误!"); throw new XServiceException("第[" + CollUtil.join(errorRowList, ",") + "]行,开始或结束时间输入错误!");
} }
//排序
list.sort(Comparator.comparing(ExcelSpaceOptimizeTemplate::getStartTime));
//开关井时间校验 //开关井时间校验
if (list.size() > 1) { if (list.size() > 1) {
//排序
list.sort(Comparator.comparing(ExcelSpaceOptimizeTemplate::getStartTime));
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
ExcelSpaceOptimizeTemplate start = list.get(0); ExcelSpaceOptimizeTemplate start = list.get(0);
DateTime firstEnd = start.getEnd(); DateTime firstEnd = start.getEnd();
......
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