From 6db3543b137bd5b033a2fdfa96c933f5b0b00a18 Mon Sep 17 00:00:00 2001 From: liao Date: Wed, 8 Nov 2023 15:06:55 +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-=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 | 4 +- .../entity/ProcessFbConsultationUserLink.java | 4 ++ ...IProcessFbStandardConsultationService.java | 3 +- ...cessFbStandardConsultationServiceImpl.java | 5 ++- .../vo/ProcessFbStandardConsultationVO.java | 37 +++++++++++++++++++ 5 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessFbStandardConsultationVO.java 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 5652a302..bd0404f2 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 @@ -2,9 +2,9 @@ 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.ProcessFbStandardConsultationVO; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -33,7 +33,7 @@ public class ProcessFbStandardConsultationController extends JeroController startProcess(@Validated @RequestBody ProcessInfoVO processInfoVO) { + 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/entity/ProcessFbConsultationUserLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationUserLink.java index 99b3a9b3..3d148e87 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 @@ -53,4 +53,8 @@ public class ProcessFbConsultationUserLink implements Serializable { @Excel(name = "设计工程师", width = 15) @ApiModelProperty(value = "设计工程师") private java.lang.String designEngineerId; + /**下发人员类型（1模块负责人、2设计工程师）*/ + @Excel(name = "下发人员类型（1模块负责人、2设计工程师）", width = 15) + @ApiModelProperty(value = "下发人员类型（1模块负责人、2设计工程师）") + private java.lang.String userType; } 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 ce26fab5..ee08641e 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,6 +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 com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; /** @@ -17,5 +18,5 @@ public interface IProcessFbStandardConsultationService extends IService processInfoVO); + void startProcess(ProcessInfoVO processInfoVO); } 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 8a9c2dc3..963a7b5a 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 @@ -8,6 +8,7 @@ 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.ProcessFbStandardConsultationVO; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.laws.common.util.CurrentUserUtil; import org.springframework.stereotype.Service; @@ -38,8 +39,8 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl processInfoVO) { - ProcessFbStandardConsultation businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + public void startProcess(ProcessInfoVO processInfoVO) { + ProcessFbStandardConsultation businessInfoDTO = processInfoVO.getBusinessInfoDTO().getProcessFbStandardConsultation(); businessInfoDTO.setId(UUIDUtils.randomUUID20()); save(businessInfoDTO); // 保存业务信息 processInfoVO.setBusinessId(businessInfoDTO.getId()); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessFbStandardConsultationVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessFbStandardConsultationVO.java new file mode 100644 index 00000000..a987391c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/vo/ProcessFbStandardConsultationVO.java @@ -0,0 +1,37 @@ +package com.jero.modules.activiti.process.fb.vo; + +import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationList; +import com.jero.modules.activiti.process.fb.entity.ProcessFbConsultationUserLink; +import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + * @Author: liao + * @Date: 2023/11/8 15:00 + * @Description: 标准征求意见流程表VO类 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="标准征求意见流程表VO类", description="标准征求意见流程表VO类") +public class ProcessFbStandardConsultationVO { + + /**业务基本信息*/ + @ApiModelProperty(value = "业务基本信息") + private ProcessFbStandardConsultation processFbStandardConsultation; + + /**业务分派信息*/ + @ApiModelProperty(value = "业务分派信息") + private ProcessFbConsultationUserLink processFbConsultationUserLink; + + /**征求意见列表*/ + @ApiModelProperty(value = "征求意见列表") + private List processFbConsultationLists; + +}