From bc7449313518faed1e78c073355b7f4dd413e083 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 15 Oct 2024 09:44:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E4=B8=93=E4=B8=9A?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=AD=97=E6=AE=B52?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/update/测试阶段.sql                                     | 2 +-
 .../entity/ProcessStandardComplianceCheck.java             | 7 +++++++
 .../listener/ProcessSCCEndListener.java                    | 2 ++
 .../impl/ProcessStandardComplianceCheckServiceImpl.java    | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql
index 20965c54..8bc57ce0 100644
--- a/db/update/测试阶段.sql
+++ b/db/update/测试阶段.sql
@@ -594,7 +594,7 @@ INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `com
 UPDATE `sys_dict` SET `dict_name` = '左/右舵' WHERE `id` = '1806891070589480961';
 
 -- 20241014 法规符合性排查流程增加专业模块字段
-ALTER TABLE `process_standard_compliance_check_detail`
+ALTER TABLE `process_standard_compliance_check`
     ADD COLUMN `specialized_module` varchar(36) NULL DEFAULT NULL COMMENT '专业模块';
 
 ALTER TABLE `laws_evaluation_not_met_library`
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java
index ff32d2be..878b2657 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java
@@ -187,6 +187,13 @@ public class ProcessStandardComplianceCheck implements Serializable {
     @TableField(exist = false)
     private String manager;
 
+    /**
+     * 专业模块
+     */
+    @Dict(dicCode = "professional_module")
+    @ApiModelProperty(value = "专业模块")
+    private String specializedModule;
+
     /**
      * 高级经理
      */
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 071ca23f..f22282a8 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
@@ -148,6 +148,7 @@ public class ProcessSCCEndListener implements ExecutionListener {
         List<LawsConformityAssessmentLibraryDetail> lawsConformityAssessmentLibraryDetails = BeanCopyUtils.copyBeanList(list, LawsConformityAssessmentLibraryDetail.class);
         LawsConformityAssessmentLibrary finalLawsConformityAssessmentLibrary = lawsConformityAssessmentLibrary;
         lawsConformityAssessmentLibraryDetails.forEach(detail -> {
+            detail.setSpecializedModule(scc.getSpecializedModule());
             detail.setBindId(finalLawsConformityAssessmentLibrary.getId());
             detail.setAssessorInitiator(processInitiator);
         });
@@ -165,6 +166,7 @@ public class ProcessSCCEndListener implements ExecutionListener {
             detail.setStandardNumber(scc.getStandardNumber());
             detail.setProblemType(detail.getResult());
             detail.setRectifyStatus(TO_BE_RECTIFIED);
+            detail.setSpecializedModule(scc.getSpecializedModule());
         });
         notMetService.saveBatch(lawsEvaluationNotMetLibraries);
         log.info("法规符合性排查流程结束监听器结束执行");
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index 5450a65c..d3484db6 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -446,6 +446,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                         detail.setValuationTime(new Date());
                     });
                     sccDetailService.saveBatch(detailInfoList, detailInfoList.size());
+                    this.updateById(standardInfo);
                 }
                 runtimeService.setVariable(processInstanceId, DISTRIBUTE, distributeFlag);
                 runtimeService.setVariable(processInstanceId, UNALLOCATED_QUANTITY, unallocatedQuantity);