diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java index f79995ba..7666a110 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java @@ -68,6 +68,9 @@ public class ProcessDraft implements Serializable { */ private String projectId; + /**任务id*/ + @ApiModelProperty(value = "任务id") + private java.lang.String taskId; /**流程审批信息-备注*/ @ApiModelProperty(value = "流程审批信息-备注") private java.lang.String handleText; 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 954d01fd..355f0ee0 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 @@ -2,11 +2,13 @@ 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.common.aspect.annotation.DictPoint; import com.jero.modules.activiti.process.common.entity.TransferVO; import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange; import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import com.jero.modules.laws.common.constant.ResultCommon; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; @@ -31,12 +33,17 @@ public class ProcessFbEntryChangeController extends JeroController queryBusinessInfo(@RequestParam(name = "id") String id) { - ProcessFbEntryChange processFbEntryChange = processFbEntryChangeService.queryBusinessInfo(id); - return Result.OK(processFbEntryChange); + @DictPoint + @GetMapping("/queryProcessInfoVO") + @AutoLog(value = "标准法规入库_变更流程-查询流程信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "draftId", value = "草稿id"), + @ApiImplicitParam(name = "processInstanceId", value = "流程实例id") + }) + @ApiOperation("标准法规入库_变更流程-查询流程信息") + public Result> queryProcessInfoVO(String draftId, String processInstanceId){ + ProcessInfoVO processInfoVO = processFbEntryChangeService.queryProcessInfoVO(draftId, processInstanceId); + return Result.OK(processInfoVO); } @AutoLog(value = "标准法规入库_变更流程-发起流程") 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 3e3402d4..7060cb0c 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 @@ -3,7 +3,6 @@ package com.jero.modules.activiti.process.fb.service; import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; -import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile; /** * @Description: 标准法规入库/变更流程 @@ -26,13 +25,6 @@ public interface IProcessFbEntryChangeService extends IService processInfoVO); + + /** + * @Author: liao + * @Date: 2023/11/8 11:12 + * @Description: 查询流程信息 + **/ + ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java index d1d8aa5a..1966bbc3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java @@ -71,4 +71,11 @@ public interface IProcessHandleService { * @Description: 根据流程定义key获取最新版本的流程定义id **/ String getDefinitionIdByKey(String definitionKey); + + /** + * @Author: liao + * @Date: 2023/11/8 11:16 + * @Description: 查询流程信息 + **/ + ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId); } 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 86ab2517..6fc8cb4e 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 @@ -81,16 +81,6 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl processInfoVO) { ProcessFbEntryChange businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - String businessId = UUIDUtils.randomUUID20(); - businessInfoDTO.setId(businessId); + if (StringUtils.isBlank(businessInfoDTO.getId())) { + businessInfoDTO.setId(UUIDUtils.randomUUID20()); + } addBusinessInfo(businessInfoDTO); // 保存业务信息 Map userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map @@ -167,8 +158,8 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl queryProcessInfoVO(String draftId, String processInstanceId) { + ProcessInfoVO processInfoVO = processHandleService.queryProcessInfoVO(draftId, processInstanceId); + ProcessFbEntryChange processFbEntryChange = getById(processInfoVO.getBusinessId()); + processInfoVO.setBusinessInfoDTO(processFbEntryChange); + return processInfoVO; + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index d77c384d..908cb67b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -241,9 +241,11 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { processDraft.setProcessInstanceId(basicProcessInfoDTO.getProcessInstanceId()); // 流程实例id processDraft.setPrcName(basicProcessInfoDTO.getProcessName()); // 流程名称 processDraft.setPrcType(basicProcessInfoDTO.getProcessType()); // 流程类型 + processDraft.setTaskId(basicTaskInfoDTO.getTaskId()); // 任务id processDraft.setHandleText(basicTaskInfoDTO.getHandleText()); // 流程审批信息-备注 processDraft.setHandleFile(basicTaskInfoDTO.getHandleFile()); // 流程审批信息-附件 processDraft.setUserId(CurrentUserUtil.getId()); // 用户id + processDraftService.save(processDraft); } @@ -260,4 +262,46 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { .singleResult().getId(); } + /** + * @Author: liao + * @Date: 2023/11/8 11:16 + * @Description: 查询流程信息 + **/ + @Override + public ProcessInfoVO queryProcessInfoVO(String draftId, String processInstanceId) { + ProcessInfoVO processInfoVO = new ProcessInfoVO(); + // 流程信息 + BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO(); + processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO); + // 审批信息 + BasicTaskInfoDTO basicTaskInfoDTO = new BasicTaskInfoDTO(); + processInfoVO.setBasicTaskInfoDTO(basicTaskInfoDTO); + + // 流程信息 + if (StringUtils.isNotBlank(processInstanceId)) { + ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); + if (!Objects.isNull(processAll)) { + basicProcessInfoDTO.setProcessInstanceId(processAll.getProcessInstanceId()); + basicProcessInfoDTO.setProcessType(processAll.getPrcType()); + basicProcessInfoDTO.setProcessName(processAll.getPrcName()); + basicProcessInfoDTO.setProcessDescription(processAll.getMes()); + basicProcessInfoDTO.setProcessDueDate(processAll.getDueTime()); + processInfoVO.setBusinessId(processAll.getProjectId()); + } + } + + // 审批信息 + if (StringUtils.isNotBlank(draftId)) { + ProcessDraft processDraft = processDraftService.getById(draftId); + if (!Objects.isNull(processDraft)) { + basicTaskInfoDTO.setTaskId(processDraft.getTaskId()); + basicTaskInfoDTO.setHandleText(processDraft.getHandleText()); + basicTaskInfoDTO.setHandleFile(processDraft.getHandleFile()); + processInfoVO.setBusinessId(processDraft.getProjectId()); + } + } + + return processInfoVO; + } + }