From ade23a7dbac6f098d50746cf731078f989a411e4 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 21 Dec 2023 17:24:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=BB=E5=8A=A1=E8=BD=AC=E4=BA=A4?= =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB=E5=8A=A8):?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsStandardizationServiceImpl.java | 4 +-- .../mapper/xml/LawsTaskTransferMapper.xml | 27 ++++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java index ca59ee66..c9b28536 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java @@ -322,8 +322,8 @@ public class LawsStandardizationServiceImpl extends ServiceImpl() - .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; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml index 52a3cc46..6597678e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/mapper/xml/LawsTaskTransferMapper.xml @@ -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