Merge remote-tracking branch 'origin/thirdStage' into thirdStage

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<ProcessDraft> draftWrapper = new LambdaQueryWrapper<>();

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;
 }

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<ProcessEsInitCha
     @Resource
     private ProcessAllService processAllService;
 
+    @Resource
+    private ILawsCommonService commonService;
+
     @Override
     public void startProcess(InitChangeDataVO initChangeData) {
         // 发起的时候校验标准编号是是否重复
@@ -113,10 +119,6 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         actFlowCommonService.autoCompleteFirstTask(userId, processInstanceId, processDefinitionId, commonVO);
         // 设置流程实例Id
         esInitChangeList.forEach(e -> 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<ProcessEsInitCha
         // 获取流程实例ID
         String processDefinitionId = processInstance.getProcessDefinitionId();
         String processInstanceId = processInstance.getId();
-        // 设置流程实例Id
-        initChange.setProcessInstanceId(processInstanceId);
-        // 生成唯一的businessId
-        String newBusinessId = actFlowCommonService.getNewBusinessId();
-        // 新增业务表数据
-        initChange.setBusinessId(newBusinessId);
+        this.setInitChangeData(standardNo, initChange, processInstanceId);
         // 保存到业务流程表
         save(initChange);
         // 保存选人信息
@@ -217,6 +214,28 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         actFlowCommonService.updateProcessAll(processInstanceId, mainDraftUser, prcName, null, prcType, null);
     }
 
+    private void setInitChangeData(String standardNo, ProcessEsInitChange initChange, String processInstanceId) {
+        Map<String, Object> 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();

laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/listener/ProcessESRecheckEndListener.java

@@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.esRecheck.listener;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
 import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
@@ -66,6 +67,10 @@ public class ProcessESRecheckEndListener implements ExecutionListener {
         recheckLambdaQueryWrapper.eq(ProcessEsRecheck::getProcessInstanceId, processInstanceId);
         ProcessEsRecheck recheck = esRecheckService.getOne(recheckLambdaQueryWrapper);
         String recheckAdvice = recheck.getRecheckAdvice();
+        String recheckPlanId = recheck.getRecheckPlanId();
+        EnterpriseStandardRecheckPlan recheckPlan = esRecheckPlanService.getById(recheckPlanId);
+        recheckPlan.setInProcessFlag(YesOrNoEnum.NO.getValue());
+        esRecheckPlanService.updateById(recheckPlan);
         String standNo = recheck.getStandardNumber();
         log.info("企标复审流程结束 监听执行器开始执行,企标编号为：{}", standNo);
         if (RECHECK_CONTINUE_VALID.equals(recheckAdvice)) {
@@ -84,6 +89,11 @@ public class ProcessESRecheckEndListener implements ExecutionListener {
             esService.update(esWrapper);
         }
         if (RECHECK_INIT_CHANGE.equals(recheckAdvice)) {
+            // 废止
+            LambdaUpdateWrapper<EnterpriseStandardRecheckPlan> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.eq(EnterpriseStandardRecheckPlan::getStandardNo, standNo);
+            wrapper.set(EnterpriseStandardRecheckPlan::getRecheckResult, RECHECK_INIT_CHANGE);
+            esRecheckPlanService.update(wrapper);
             // 修订 自动发起企标立项/变更流程（修订模式）
             esInitChangeService.autoStartProcessByRecheck(standNo);
         }

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";