From 959b765e9af0730d7b8ff347430fcf5fd1044fb5 Mon Sep 17 00:00:00 2001 From: liao Date: Fri, 10 Nov 2023 10:58:57 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E8=A1=A8-=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProcessFbConsultationUserLink.java | 8 +++---- .../ProcessFbConsultationUserLinkMapper.xml | 2 +- ...cessFbStandardConsultationServiceImpl.java | 24 +++++++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationUserLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationUserLink.java index 3d148e87..0474b4aa 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationUserLink.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationUserLink.java @@ -37,10 +37,10 @@ public class ProcessFbConsultationUserLink implements Serializable { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键ID") private java.lang.String id; - /**标准征求意见流程表id*/ - @Excel(name = "标准征求意见流程表id", width = 15) - @ApiModelProperty(value = "标准征求意见流程表id") - private java.lang.String standardConsultationId; + /**业务id*/ + @Excel(name = "业务id", width = 15) + @ApiModelProperty(value = "业务id") + private java.lang.String businessId; /**部门主管级领导*/ @Excel(name = "部门主管级领导", width = 15) @ApiModelProperty(value = "部门主管级领导") diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbConsultationUserLinkMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbConsultationUserLinkMapper.xml index 67deb0af..6e1451b8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbConsultationUserLinkMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/xml/ProcessFbConsultationUserLinkMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index b8faf5de..aa533726 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -1,22 +1,29 @@ package com.jero.modules.activiti.process.fb.service.impl; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.util.UUIDUtils; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey; import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; +import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationUserLink; import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; import com.jero.modules.activiti.process.fb.mapper.ProcessFbStandardConsultationMapper; +import com.jero.modules.activiti.process.fb.service.IProcessFbConsultationUserLinkService; import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.laws.common.util.CurrentUserUtil; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.Map; @@ -32,6 +39,8 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map + String departLeaders = (String) userInfoMap.get("departLeaderList"); + if (StringUtils.isBlank(departLeaders)) { + throw new JeroBootException(ResultCommon.EMPTY_COMMON, "departLeaderList"); + } userInfoMap.put("engineer", CurrentUserUtil.getId()); // 第一个任务节点设置成自己 BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.FB_STANDARD_CONSULTATION)); // 流程定义id basicProcessInfoDTO.setProcessName(businessInfoDTO.getStandardNumber() + "-" + businessInfoDTO.getStandardName() + "-" + "征求意见"); // 流程名称 basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_STANDARD_CONSULTATION.getValue()); // 流程类型 processHandleService.startProcess(processInfoVO); + + // 把各部所主管级领导数据存入关联人员表 + List departLeaderList = Arrays.asList(departLeaders.split(",")); + List linkList = new ArrayList<>(); + departLeaderList.forEach(departLeader -> { + ProcessFbConsultationUserLink link = new ProcessFbConsultationUserLink(); + link.setBusinessId(processInfoVO.getBusinessId()); + link.setDepartLeaderId(departLeader); + linkList.add(link); + }); + processFbConsultationUserLinkService.saveBatch(linkList, linkList.size()); } }