ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(任务转交、标准化活动):查询修改

Browse Source
This commit is contained in:
yjz
2023-12-21 17:24:11 +08:00
parent 93ac4c9a06
commit ade23a7dba
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+2 -2
View File
@@ -322,8 +322,8 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
LawsStandardization lawsStandardization = getById(id);
// 填充上级节点名称
LawsStandardization standardization = getOne(new LambdaQueryWrapper<LawsStandardization>()
.eq(LawsStandardization::getId, lawsStandardization.getPid()));
if (StringUtils.isNotBlank(standardization.getName())){
.eq(LawsStandardization::getId, lawsStandardization.getPid()), false);
if (!Objects.isNull(standardization) && StringUtils.isNotBlank(standardization.getName())){
lawsStandardization.setSupperName(standardization.getName());
}
return lawsStandardization;
laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml
+17 -10
View File
@@ -33,19 +33,26 @@
UNION ALL
SELECT i.id AS id,
serial_number_right AS standard_no,
(CASE
SELECT i.id AS id,
(CONCAT(serial_number_left, ',', serial_number_right)) AS standard_no,
(CONCAT((CASE
WHEN LENGTH(s.standard_name) > 0 THEN s.standard_name
WHEN LENGTH(d.standard_name) > 0 THEN d.standard_name
ELSE title_right END) AS standard_name,
'3' AS type,
'3' AS role,
u.id AS user,
i.create_time AS create_time
ELSE title_left END), ',',
(CASE
WHEN LENGTH(s2.standard_name) > 0 THEN s2.standard_name
WHEN LENGTH(d2.standard_name) > 0 THEN d2.standard_name
ELSE title_right END))
) AS standard_name,
'3' AS type,
'3' AS role,
u.id AS user,
i.create_time AS create_time
FROM sar_file_compare_info i
LEFT JOIN laws_domestic_standard s ON i.serial_number_right = s.id AND s.del_flag = 0
LEFT JOIN laws_enterprise_standard d ON i.serial_number_right = d.id AND d.del_flag = 0
LEFT JOIN laws_domestic_standard s ON i.serial_number_left = s.id AND s.del_flag = 0
LEFT JOIN laws_enterprise_standard d ON i.serial_number_left = d.id AND d.del_flag = 0
LEFT JOIN laws_domestic_standard s2 ON i.serial_number_right = s2.id AND s.del_flag = 0
LEFT JOIN laws_enterprise_standard d2 ON i.serial_number_right = d2.id AND d.del_flag = 0
LEFT JOIN sys_user u ON i.create_by = u.username AND u.del_flag = 0
UNION ALL