feat: 法规符合性评估库详情增加评估发起人

laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java

@@ -7,6 +7,7 @@ import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessS
 import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail;
 import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckDetailService;
 import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckService;
+import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessApprovalRecordService;
 import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary;
 import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail;
@@ -61,6 +62,9 @@ public class ProcessSCCEndListener implements ExecutionListener {
     @Resource
     private ProcessApprovalRecordService processApprovalRecordService;
 
+    @Resource
+    private ProcessAllService paService;
+
     public static final String TO_BE_RECTIFIED = "1";
     
     @Override
@@ -140,10 +144,12 @@ public class ProcessSCCEndListener implements ExecutionListener {
             calService.updateById(lawsConformityAssessmentLibrary);
         }
 
+        String processInitiator = paService.getByProcessInstanceId(processInstanceId).getCreateUserId();
         List<LawsConformityAssessmentLibraryDetail> lawsConformityAssessmentLibraryDetails = BeanCopyUtils.copyBeanList(list, LawsConformityAssessmentLibraryDetail.class);
         LawsConformityAssessmentLibrary finalLawsConformityAssessmentLibrary = lawsConformityAssessmentLibrary;
         lawsConformityAssessmentLibraryDetails.forEach(detail -> {
             detail.setBindId(finalLawsConformityAssessmentLibrary.getId());
+            detail.setAssessorInitiator(processInitiator);
         });
         calDetailService.saveBatch(lawsConformityAssessmentLibraryDetails);
         // 找出不符合和待验证的存入不符合项库

laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java

@@ -95,6 +95,13 @@ public class LawsConformityAssessmentLibraryDetail implements Serializable {
     @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     private String assessor;
 
+    /**
+     * 评估发起人
+     */
+    @ApiModelProperty(value = "评估发起人")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
+    private String assessorInitiator;
+
     /**
      * 评估结果
      */