From cd604ff97195012e32884c8bd4dd6f672e184d34 Mon Sep 17 00:00:00 2001 From: liao Date: Wed, 8 Nov 2023 14:52:27 +0800 Subject: [PATCH] =?UTF-8?q?add=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-=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ocessFbStandardConsultationController.java | 15 +++++++ ...IProcessFbStandardConsultationService.java | 10 +++-- .../impl/ProcessFbEntryChangeServiceImpl.java | 1 + ...cessFbStandardConsultationServiceImpl.java | 41 +++++++++++++++---- 4 files changed, 57 insertions(+), 10 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java index 57879998..5652a302 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java @@ -1,10 +1,17 @@ package com.jero.modules.activiti.process.fb.controller; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange; import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -22,4 +29,12 @@ import io.swagger.annotations.Api; public class ProcessFbStandardConsultationController extends JeroController { @Autowired private IProcessFbStandardConsultationService processFbStandardConsultationService; + + @AutoLog(value = "标准征求意见流程-发起流程") + @ApiOperation(value = "标准征求意见流程-发起流程", notes = "标准征求意见流程-发起流程") + @PostMapping(value = "/startProcess") + public Result startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) { + processFbStandardConsultationService.startProcess(processInfoVO); + return Result.OK(); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java index 93b2d88a..ce26fab5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java @@ -2,9 +2,7 @@ package com.jero.modules.activiti.process.fb.service; import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; import com.baomidou.mybatisplus.extension.service.IService; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import java.util.List; +import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; /** * @Description: 标准征求意见流程表 @@ -14,4 +12,10 @@ import java.util.List; */ public interface IProcessFbStandardConsultationService extends IService { + /** + * @Author: liao + * @Date: 2023/11/8 14:35 + * @Description: 发起流程 + **/ + void startProcess(ProcessInfoVO processInfoVO); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index 8611deb3..30cd57ff 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -92,6 +92,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map 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 d438f0d0..8a9c2dc3 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,19 +1,22 @@ package com.jero.modules.activiti.process.fb.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.ProcessFbStandardConsultation; import com.jero.modules.activiti.process.fb.mapper.ProcessFbStandardConsultationMapper; 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.ProcessInfoVO; +import com.jero.modules.laws.common.util.CurrentUserUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; -import java.util.List; -import java.util.Date; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.query.QueryGenerator; -import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import javax.annotation.Resource; +import java.util.Map; /** @@ -26,4 +29,28 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @Transactional(rollbackFor = JeroBootException.class) public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl implements IProcessFbStandardConsultationService { + @Resource + private IProcessHandleService processHandleService; + + /** + * @Author: liao + * @Date: 2023/11/8 14:36 + * @Description: 发起流程 + **/ + @Override + public void startProcess(ProcessInfoVO processInfoVO) { + ProcessFbStandardConsultation businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + businessInfoDTO.setId(UUIDUtils.randomUUID20()); + save(businessInfoDTO); // 保存业务信息 + processInfoVO.setBusinessId(businessInfoDTO.getId()); + + Map userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map + 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); + + } }