From 81b5eeb21f1ad897aa902ca466393cd6b7bd6685 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 16 Jan 2024 10:42:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2080523=20=E4=BC=81=E6=A0=87=E5=A4=8D?= =?UTF-8?q?=E5=AE=A1=E6=B5=81=E7=A8=8B--=E4=BF=AE=E8=AE=A2=E5=AE=8C?= =?UTF-8?q?=E6=88=90--=E7=AB=8B=E9=A1=B9=E4=BF=AE=E8=AE=A2=E7=9A=84?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=87=AA=E5=8A=A8=E5=8F=91=E8=B5=B7=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/ActFlowCommonService.java | 4 -- .../entity/ProcessEsInitChange.java | 6 --- .../impl/ProcessEsInitChangeServiceImpl.java | 39 ++++++++++++++----- .../laws/common/constant/FieldCommon.java | 2 + 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 68692385..23645aad 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -327,10 +327,6 @@ public class ActFlowCommonService { return standTypeVO; } - public String getNewBusinessId() { - return UUID.randomUUID().toString().replace("-", ""); - } - public ProcessDraft getExistDraft(String draftId, ProcessTypeEnum processTypeEnum) { String userId = UserUtils.getUserId(); LambdaQueryWrapper draftWrapper = new LambdaQueryWrapper<>(); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java index 6a8c528d..5b85bfbe 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java @@ -521,12 +521,6 @@ public class ProcessEsInitChange implements Serializable { @ApiModelProperty(value = "配合单位") private String cooperationUnit; - /** - * 流程业务统一Id - */ - @ApiModelProperty(value = "流程业务统一Id") - private String businessId; - @TableField(exist = false) private static final long serialVersionUID = 1781238971297838971L; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index b2094913..5c8f7486 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -27,11 +27,14 @@ import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessNodeLinkService; +import com.jero.modules.laws.common.constant.FieldCommon; +import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.sys.utils.UserUtils; +import com.jero.modules.tag.enums.TableNameEnum; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; @@ -84,6 +87,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl e.setProcessInstanceId(processInstanceId)); - // 生成唯一的businessId - String newBusinessId = actFlowCommonService.getNewBusinessId(); - // 新增业务表数据 - esInitChangeList.forEach(e -> e.setBusinessId(newBusinessId)); // 保存到业务流程表 saveOrUpdateBatch(esInitChangeList); // 保存选人信息 @@ -200,12 +202,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl es = commonService.getByIdAndModule(null, TableNameEnum.ENTERPRISE_STANDARDS.getValue(), "2", standardNo); + initChange.setProcessInstanceId(processInstanceId) + .setApplicationCategory(ESPApplicationCategoryEnum.INITIATION.getValue()) + .setProjectType(ESPProjectType.MODIFY.getValue()) + .setOriginEnStandardNo((String) es.get(FieldCommon.STANDARD_NUMBER)) + .setOriginEnStandardName((String) es.get(FieldCommon.STANDARD_NAME)) + .setDecadeCode((String) es.get(FieldCommon.YEAR_NUMBER)) + .setEnStandardEnglishName((String) es.get(FieldCommon.STANDARD_ENGLISH_NAME)) + .setEnStandardSystem((String) es.get(FieldCommon.STANDARD_SYSTEM)) + .setStandardType((String) es.get(FieldCommon.STANDARD_CLASS)) + .setStandardCategoryCode((String) es.get(FieldCommon.STANDARD_CATEGORY_CODE)) + .setCompilationDescription((String) es.get(FieldCommon.COMP_ILLUSTRATION)) + .setComponentName((String) es.get(FieldCommon.PART_NAME)) + .setAuthDept((String) es.get(FieldCommon.AUTH_DEPT)) + .setMainDraftingUser((String) es.get(FieldCommon.MAIN_DRAFTING_USER)) + .setMainDraftingUnit((String) es.get(FieldCommon.MAIN_DRAFTING_UNIT)) + .setMainDraftingUnitResponsiblePerson((String) es.get(FieldCommon.MAIN_DRAFTING_UNIT_RESPONSIBLE_PERSON)) + .setStandardPromoter((String) es.get(FieldCommon.STANDARD_PROMOTER)) + .setCooperationUnit((String) es.get(FieldCommon.COOPERATION_UNIT)); + } + @Override public void approvalInitChange(InitChangeDataVO initChangeDataVO, boolean pass) { String userId = UserUtils.getUserId(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java index e71e7db4..81adbb67 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java @@ -208,6 +208,8 @@ public class FieldCommon { public static final String MAIN_DRAFTING_UNIT_RESPONSIBLE_PERSON = "main_drafting_unit_responsible_person"; // 标准推进人 public static final String STANDARD_PROMOTER = "standard_promoter"; + // 配合单位 + public static final String COOPERATION_UNIT = "cooperation_unit"; // 责任部门负责人 public static final String RESPONSIBLE_DEPARTMENT_USER = "responsible_department_user";