Commit 1c2396c0 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.添加easy excel配置,增加转换器,增加全局excel导出样式,增加场站下拉选解析器;
2.开发光伏电站模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 4ab89abc
...@@ -599,7 +599,7 @@ ...@@ -599,7 +599,7 @@
AND is_deleted = 1 AND is_deleted = 1
AND grid_type_key = '1' AND grid_type_key = '1'
AND line_type_key = '10' AND line_type_key = '10'
ORDER BY line_name DESC) ORDER BY line_name)
UNION ALL UNION ALL
(SELECT ROW_NUMBER() OVER ( ORDER BY create_time ) AS rn, ou_id AS id, (SELECT ROW_NUMBER() OVER ( ORDER BY create_time ) AS rn, ou_id AS id,
line_name AS ou_name, line_name AS ou_name,
...@@ -610,7 +610,7 @@ ...@@ -610,7 +610,7 @@
WHERE ou_id = #{id} WHERE ou_id = #{id}
AND is_deleted = 1 AND is_deleted = 1
AND grid_type_key = '0' AND grid_type_key = '0'
ORDER BY line_name DESC) ORDER BY line_name)
</select> </select>
<select id="selectChildLineList" parameterType="pps.core.system.entity.SysOrganizationView" <select id="selectChildLineList" parameterType="pps.core.system.entity.SysOrganizationView"
...@@ -623,7 +623,7 @@ ...@@ -623,7 +623,7 @@
FROM base_power_line FROM base_power_line
WHERE upper_line_id = #{id} WHERE upper_line_id = #{id}
AND is_deleted = 1 AND is_deleted = 1
ORDER BY line_name DESC ORDER BY line_name
</select> </select>
<select id="selectOrgProvince" parameterType="pps.core.system.entity.SysOrganizationView" resultMap="BaseResultMap"> <select id="selectOrgProvince" parameterType="pps.core.system.entity.SysOrganizationView" resultMap="BaseResultMap">
......
...@@ -263,7 +263,8 @@ public class BasePhotovoltaicPlantService { ...@@ -263,7 +263,8 @@ public class BasePhotovoltaicPlantService {
ouId = input.getParentOuId(); ouId = input.getParentOuId();
viewList = mapper.selectOuSonByParentOuId(record); viewList = mapper.selectOuSonByParentOuId(record);
} }
queryWrapper.lambda().eq(BasePhotovoltaicPlantEnt::getOuId, ouId).eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE); queryWrapper.lambda().eq(BasePhotovoltaicPlantEnt::getOuId, ouId).eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE)
.orderByAsc(BasePhotovoltaicPlantEnt::getStationName);
List<BasePhotovoltaicPlantEnt> plantList = plantMapper.selectList(queryWrapper); List<BasePhotovoltaicPlantEnt> plantList = plantMapper.selectList(queryWrapper);
plantList.forEach(item -> { plantList.forEach(item -> {
SysOrganizationView view = new SysOrganizationView(); SysOrganizationView view = new SysOrganizationView();
......
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