Commit 00d922aa authored by ZWT's avatar ZWT

feat(能源管理系统): 间开制度管理

1.修改基础信息配置-井口配置模块删除接口,增加私有方法校验井口是否已被线路引用;
2.修改基础信息配置-光伏电站配置模块删除接口,增加私有方法校验光伏电站是否已被线路引用;
3.修改基础信息配置-储能设备配置模块删除接口,增加私有方法校验储能设备是否已被线路引用;
4.修改基础信息配置-柴发设备配置模块删除接口,增加私有方法校验柴发设备是否已被线路引用;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent fd2fba5f
...@@ -41,6 +41,7 @@ import xstartup.data.XPageResult; ...@@ -41,6 +41,7 @@ import xstartup.data.XPageResult;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult; import xstartup.data.XSingleResult;
import xstartup.error.XError; import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet; import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
import xstartup.helper.XTransactionHelper; import xstartup.helper.XTransactionHelper;
...@@ -456,6 +457,7 @@ public class SysOrganizationService { ...@@ -456,6 +457,7 @@ public class SysOrganizationService {
* @param input 输入 * @param input 输入
* @return {@link XListResult}<{@link DynamicQuerySysOrganizationOutput}> * @return {@link XListResult}<{@link DynamicQuerySysOrganizationOutput}>
*/ */
@XApiAnonymous
@XText("组织机构管理--查询组织和线路列表") @XText("组织机构管理--查询组织和线路列表")
@XApiGet @XApiGet
public XListResult<DynamicQuerySysOrganizationOutput> queryOrgAndLineList(XContext context, DynamicQuerySysOrganizationInput input) { public XListResult<DynamicQuerySysOrganizationOutput> queryOrgAndLineList(XContext context, DynamicQuerySysOrganizationInput input) {
......
...@@ -578,23 +578,22 @@ ...@@ -578,23 +578,22 @@
FROM sys_organization_rel r FROM sys_organization_rel r
LEFT JOIN sys_organization o ON o.id = r.ou_id LEFT JOIN sys_organization o ON o.id = r.ou_id
WHERE r.parent_ou_id = #{id} WHERE r.parent_ou_id = #{id}
AND o.is_deleted = 1
ORDER BY r.sort) ORDER BY r.sort)
UNION ALL UNION ALL
(SELECT ou_id AS id, line_name AS ou_name, id AS line_id, 'LINE' AS ou_level (SELECT ou_id AS id, line_name AS ou_name, id AS line_id, 'LINE' AS ou_level
FROM base_power_line FROM base_power_line
WHERE ou_id = #{id} WHERE ou_id = #{id}
AND is_deleted = 1
ORDER BY modify_time DESC) ORDER BY modify_time DESC)
</select> </select>
<select id="selectOrgProvince" parameterType="pps.core.system.entity.SysOrganizationView" resultMap="BaseResultMap"> <select id="selectOrgProvince" parameterType="pps.core.system.entity.SysOrganizationView" resultMap="BaseResultMap">
SELECT SELECT province,
province ,
sa.name province_name sa.name province_name
from from sys_organization so
sys_organization so
left join sys_area sa on left join sys_area sa on
sa.id = so.province sa.id = so.province
where where so.id = #{id}
so.id = #{id}
</select> </select>
</mapper> </mapper>
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