Commit 00138f59 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.邮件发送服务代码修改,修改配置文件及发送逻辑,解决邮件名称唯一性;
2.邮件接收功能修改,解决邮件接收协议修改后导致的一系列问题;
3.长期间开优化功能修改,修改定时任务处理逻辑及执行周期;
4.中期间开优化功能修改,修改定时任务处理逻辑及执行周期;
5.超长期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
6.超短期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
7.组织线路树功能修改,重构查询逻辑;
8.间开优化历史功能修改,重构查询逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 05220e73
...@@ -577,7 +577,7 @@ ...@@ -577,7 +577,7 @@
<select id="selectOrgAndLineList" parameterType="pps.core.system.entity.SysOrganizationView" <select id="selectOrgAndLineList" parameterType="pps.core.system.entity.SysOrganizationView"
resultMap="ExtendResultMap"> resultMap="ExtendResultMap">
(SELECT o.id, (SELECT ROW_NUMBER() OVER ( ORDER BY r.sort ) AS rn, o.id,
o.ou_name AS ou_name, o.ou_name AS ou_name,
'' AS line_id, '' AS line_id,
'ORG' AS ou_level, 'ORG' AS ou_level,
...@@ -589,7 +589,7 @@ ...@@ -589,7 +589,7 @@
AND o.is_deleted = 1 AND o.is_deleted = 1
ORDER BY r.sort) ORDER BY r.sort)
UNION ALL UNION ALL
(SELECT id AS id, (SELECT ROW_NUMBER() OVER ( ORDER BY create_time ) AS rn, id AS id,
line_name AS ou_name, line_name AS ou_name,
id AS line_id, id AS line_id,
'LINE' AS ou_level, 'LINE' AS ou_level,
...@@ -599,9 +599,9 @@ ...@@ -599,9 +599,9 @@
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 modify_time DESC) ORDER BY create_time DESC)
UNION ALL UNION ALL
(SELECT 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,
id AS line_id, id AS line_id,
'LINE' AS ou_level, 'LINE' AS ou_level,
...@@ -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 modify_time DESC) ORDER BY create_time DESC)
</select> </select>
<select id="selectChildLineList" parameterType="pps.core.system.entity.SysOrganizationView" <select id="selectChildLineList" parameterType="pps.core.system.entity.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