From 37943f134d9b8d048e569964a6a5e8dbcb302513 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 24 Jul 2024 16:29:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=BA=93=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/ProcessSCCEndListener.java                    | 7 +++++++
 .../mapper/xml/LawsEvaluationNotMetLibraryMapper.xml       | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java
index 24fd0596..8a944165 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java
@@ -60,6 +60,8 @@ public class ProcessSCCEndListener implements ExecutionListener {
 
     @Resource
     private ProcessApprovalRecordService processApprovalRecordService;
+
+    public static final String TO_BE_RECTIFIED = "1";
     
     @Override
     public void notify(DelegateExecution delegateExecution) {
@@ -152,6 +154,11 @@ public class ProcessSCCEndListener implements ExecutionListener {
         lawsEvaluationNotMetLibraries.forEach(detail -> {
             detail.setId(null);
             detail.setAllApprovalUser(allApprovalUsers);
+            detail.setStandardId(scc.getStandardId());
+            detail.setStandardName(scc.getStandardName());
+            detail.setStandardNumber(scc.getStandardNumber());
+            detail.setProblemType(detail.getResult());
+            detail.setRectifyStatus(TO_BE_RECTIFIED);
         });
         notMetService.saveBatch(lawsEvaluationNotMetLibraries);
         log.info("法规符合性排查流程结束监听器结束执行");
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryMapper.xml b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryMapper.xml
index ab05d8e5..fbee31d3 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsEvaluationNotMetLibraryMapper.xml
@@ -13,8 +13,12 @@
     </sql>
 
     <select id="pageList" resultType="com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary">
-        select nm.*
+        select nm.*,
+               nm.standard_id,
+               IF(nm.standard_id IS NOT NULL, d.standard_number, d.standard_number) AS standard_number,
+               IF(nm.standard_id IS NOT NULL, d.standard_name, d.standard_name)     AS standard_name
         from laws_evaluation_not_met_library nm
+            left join laws_domestic_standard as d on d.id = nm.standard_id
             ${ew.customSqlSegment}
     </select>
 </mapper>