From 7025c0ae537741921bc9834b70ee64886c436d8e Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 8 Jul 2024 15:29:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B-=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=8F=91=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...essStandardComplianceCheckServiceImpl.java | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

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 2576cd1e..5d768eb4 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
@@ -1,6 +1,7 @@
 package com.jero.modules.activiti.process.standardComplianceCheck.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.activiti.common.ActivitiCommon;
@@ -91,7 +92,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         // 当前用户Id
         String userId = UserUtils.getUserId();
         // 设置流程变量
-        Map<String, Object> actVariables = this.setVariables(businessInfoDTO);
+        Map<String, Object> actVariables = this.setVariables(processInfoVO);
         // 删除草稿
         actFlowCommonService.getExistDraftAndRemove(processInfoVO.getDraftId());
         // 启动流程
@@ -105,7 +106,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         // 第一个节点业务数据处理
         this.startNodeBusProcess(processInfoVO);
         // 保存选人信息
-        processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(userInfoMap));
+        processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userInfoMap);
         // 获取第一个任务的taskId
         String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
         // 保存第一个节点的草稿
@@ -123,20 +124,25 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
      * @param processInfoVO
      */
     private void startNodeBusProcess(ProcessInfoVO<ProcessSccVO> processInfoVO) {
+        String processInstanceId = processInfoVO.getBasicProcessInfoDTO().getProcessInstanceId();
         ProcessSccVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
-        ProcessStandardComplianceCheck standardInfo = businessInfoDTO.getStandardInfo();
-        List<ProcessStandardComplianceCheckDetail> detailInfoList = businessInfoDTO.getDetailInfoList();
-
+        String id = businessInfoDTO.getStandardInfo().getId();
+        // 主表设置流程实例Id
+        LambdaUpdateWrapper<ProcessStandardComplianceCheck> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(ProcessStandardComplianceCheck::getProcessInstanceId, processInstanceId);
+        updateWrapper.eq(ProcessStandardComplianceCheck::getId, id);
+        this.update(updateWrapper);
+        // 子表设置流程实例Id
+        LambdaUpdateWrapper<ProcessStandardComplianceCheckDetail> childUpdateWrapper = new LambdaUpdateWrapper<>();
+        childUpdateWrapper.set(ProcessStandardComplianceCheckDetail::getProcessInstanceId, processInstanceId);
+        childUpdateWrapper.eq(ProcessStandardComplianceCheckDetail::getCheckId, id);
+        sccDetailService.update(childUpdateWrapper);
     }
 
-    private Map<String, Object> setVariables(ProcessSccVO businessInfoDTO) {
-        // TODO 转List
-        return new HashMap<>();
-    }
-
-    private Map<String, Object> getUserMap(Map<String, Object> map) {
-        // TODO 转逗号拼接
-        return map;
+    private Map<String, Object> setVariables(ProcessInfoVO<ProcessSccVO> businessInfoDTO) {
+        // 人员信息
+        Map<String, Object> userInfoMap = businessInfoDTO.getUserInfoMap();
+        return new HashMap<>(userInfoMap);
     }
 
     @Override
@@ -181,8 +187,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
 
     }
 
-
-
     @Override
     public String generate(ProcessStandardComplianceCheck scc, MultipartFile modelFile, MultipartFile splitFile) throws Exception {
         // 文件内容转换