From 0ac5f63eacf53944eec203255b5f0fa0f28f21b6 Mon Sep 17 00:00:00 2001 From: liao Date: Tue, 7 Nov 2023 16:59:22 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=85=A5=E5=BA=93=5F=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProcessFbEntryChangeController.java | 6 +++--- .../fb/service/IProcessFbEntryChangeService.java | 4 ++-- .../impl/ProcessFbEntryChangeServiceImpl.java | 13 +++++++++++-- .../activiti/process/fb/vo/ProcessInfoVO.java | 13 +++++++++---- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java index 22cd41a7..35eb967d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java @@ -63,7 +63,7 @@ public class ProcessFbEntryChangeController extends JeroController startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) { + public Result startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) { processFbEntryChangeService.startProcess(processInfoVO); return Result.OK(); } @@ -71,7 +71,7 @@ public class ProcessFbEntryChangeController extends JeroController agree(@Validated @RequestBody ProcessInfoVO processInfoVO) { + public Result agree(@Validated @RequestBody ProcessInfoVO processInfoVO) { processFbEntryChangeService.approveTask(processInfoVO, true); return Result.OK(); } @@ -79,7 +79,7 @@ public class ProcessFbEntryChangeController extends JeroController reject(@Validated @RequestBody ProcessInfoVO processInfoVO) { + public Result reject(@Validated @RequestBody ProcessInfoVO processInfoVO) { processFbEntryChangeService.approveTask(processInfoVO, true); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java index c7645445..90917771 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbEntryChangeService.java @@ -38,14 +38,14 @@ public interface IProcessFbEntryChangeService extends IService processInfoVO); /** * @Author: liao * @Date: 2023/11/6 14:52 * @Description: 审批 **/ - void approveTask(ProcessInfoVO processInfoVO, boolean pass); + void approveTask(ProcessInfoVO processInfoVO, boolean pass); /** * @Author: liao 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 f4d95316..f19c87d7 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 @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.fb.service.impl; +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; @@ -96,7 +97,12 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl processInfoVO) { + ProcessFbEntryChange businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + String businessId = UUIDUtils.randomUUID20(); + businessInfoDTO.setId(businessId); + save(businessInfoDTO); // 保存业务信息 + Map userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map userInfoMap.put("engineer", CurrentUserUtil.getId()); // 第一个任务节点设置成自己 BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); @@ -112,7 +118,10 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl processInfoVO, boolean pass) { + ProcessFbEntryChange businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + processInfoVO.setBusinessId(businessInfoDTO.getId()); + updateById(businessInfoDTO); processHandleService.approveTask(processInfoVO, pass); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java index a3247d46..e61389a9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessInfoVO.java @@ -1,7 +1,5 @@ package com.jero.modules.activiti.process.fb.vo; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.aspect.annotation.Dict; import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO; import io.swagger.annotations.ApiModel; @@ -9,8 +7,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; import java.util.Map; /** @@ -22,7 +20,10 @@ import java.util.Map; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="流程信息通用类", description="流程信息通用类") -public class ProcessInfoVO { +public class ProcessInfoVO implements Serializable { + + private static final long serialVersionUID = 1L; + /**流程信息*/ @ApiModelProperty(value = "流程信息") private BasicProcessInfoDTO basicProcessInfoDTO; @@ -35,6 +36,10 @@ public class ProcessInfoVO { @ApiModelProperty(value = "业务id") private String businessId; + /**业务信息*/ + @ApiModelProperty(value = "业务信息") + private T businessInfoDTO; + /**人员信息*/ @ApiModelProperty(value = "人员信息") private Map userInfoMap;