feat: 法规符合性评估库详情增加评估发起人
This commit is contained in:
+5
-1
@@ -355,4 +355,8 @@ ALTER TABLE `process_market_standard_release`
|
|||||||
|
|
||||||
-- 2024-09-13 增加辅助说明材料字段
|
-- 2024-09-13 增加辅助说明材料字段
|
||||||
ALTER TABLE `process_standard_compliance_check_detail`
|
ALTER TABLE `process_standard_compliance_check_detail`
|
||||||
ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料' AFTER `assessor`;
|
ADD COLUMN `unsatisfied_require_attach` varchar(500) NULL COMMENT '辅助说明材料' AFTER `assessor`;
|
||||||
|
|
||||||
|
-- 2024-09-13 增加评估发起人
|
||||||
|
ALTER TABLE `laws_conformity_assessment_library_detail`
|
||||||
|
ADD COLUMN `assessor_initiator` varchar(500) NULL COMMENT '评估发起人' AFTER `bind_id`;
|
||||||
+6
@@ -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.entity.ProcessStandardComplianceCheckDetail;
|
||||||
import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckDetailService;
|
import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckDetailService;
|
||||||
import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckService;
|
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.activiti.service.ProcessApprovalRecordService;
|
||||||
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary;
|
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary;
|
||||||
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail;
|
import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail;
|
||||||
@@ -61,6 +62,9 @@ public class ProcessSCCEndListener implements ExecutionListener {
|
|||||||
@Resource
|
@Resource
|
||||||
private ProcessApprovalRecordService processApprovalRecordService;
|
private ProcessApprovalRecordService processApprovalRecordService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private ProcessAllService paService;
|
||||||
|
|
||||||
public static final String TO_BE_RECTIFIED = "1";
|
public static final String TO_BE_RECTIFIED = "1";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -140,10 +144,12 @@ public class ProcessSCCEndListener implements ExecutionListener {
|
|||||||
calService.updateById(lawsConformityAssessmentLibrary);
|
calService.updateById(lawsConformityAssessmentLibrary);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String processInitiator = paService.getByProcessInstanceId(processInstanceId).getCreateUserId();
|
||||||
List<LawsConformityAssessmentLibraryDetail> lawsConformityAssessmentLibraryDetails = BeanCopyUtils.copyBeanList(list, LawsConformityAssessmentLibraryDetail.class);
|
List<LawsConformityAssessmentLibraryDetail> lawsConformityAssessmentLibraryDetails = BeanCopyUtils.copyBeanList(list, LawsConformityAssessmentLibraryDetail.class);
|
||||||
LawsConformityAssessmentLibrary finalLawsConformityAssessmentLibrary = lawsConformityAssessmentLibrary;
|
LawsConformityAssessmentLibrary finalLawsConformityAssessmentLibrary = lawsConformityAssessmentLibrary;
|
||||||
lawsConformityAssessmentLibraryDetails.forEach(detail -> {
|
lawsConformityAssessmentLibraryDetails.forEach(detail -> {
|
||||||
detail.setBindId(finalLawsConformityAssessmentLibrary.getId());
|
detail.setBindId(finalLawsConformityAssessmentLibrary.getId());
|
||||||
|
detail.setAssessorInitiator(processInitiator);
|
||||||
});
|
});
|
||||||
calDetailService.saveBatch(lawsConformityAssessmentLibraryDetails);
|
calDetailService.saveBatch(lawsConformityAssessmentLibraryDetails);
|
||||||
// 找出不符合和待验证的存入不符合项库
|
// 找出不符合和待验证的存入不符合项库
|
||||||
|
|||||||
+7
@@ -95,6 +95,13 @@ public class LawsConformityAssessmentLibraryDetail implements Serializable {
|
|||||||
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
||||||
private String assessor;
|
private String assessor;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 评估发起人
|
||||||
|
*/
|
||||||
|
@ApiModelProperty(value = "评估发起人")
|
||||||
|
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
|
||||||
|
private String assessorInitiator;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 评估结果
|
* 评估结果
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user