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 2ef3ee2d..1237f125 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 @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.fb.service; import com.jero.modules.activiti.process.fb.dto.ProcessDTO; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import org.activiti.engine.runtime.ProcessInstance; +import org.apache.poi.ss.formula.functions.T; import java.util.List; import java.util.Map; @@ -83,6 +84,8 @@ public interface IProcessHandleService { **/ String getDefinitionIdByKey(String definitionKey); + ProcessInfoVO getDraft(String draftId); + /** * @Author: liao * @Date: 2023/11/20 16:48 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 7a37f1ba..345fa723 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 @@ -13,6 +13,7 @@ import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO; import com.jero.modules.activiti.process.fb.dto.ProcessDTO; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; +import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessNodeLinkService; @@ -26,6 +27,7 @@ import org.activiti.engine.runtime.Execution; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -306,6 +308,34 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { processDraftService.save(processDraft); } + @Override + public ProcessInfoVO getDraft(String draftId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId()); + wrapper.eq(ProcessDraft::getId, draftId); + ProcessDraft processDraft = processDraftService.getOne(wrapper); + ProcessInfoVO processInfoVO = new ProcessInfoVO(); + + BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO(); + BasicTaskInfoDTO basicTaskInfoDTO = new BasicTaskInfoDTO(); + + processInfoVO.setBusinessId(processDraft.getProjectId()); // 业务id + basicProcessInfoDTO.setProcessInstanceId(processDraft.getProcessInstanceId()) ; // 流程实例id + basicProcessInfoDTO.setProcessName(processDraft.getPrcName()) ; // 流程名称 + basicProcessInfoDTO.setProcessType(processDraft.getPrcType()) ; // 流程类型 + basicProcessInfoDTO.setProcessDueDate(processDraft.getProcessDueDate()) ; // 流程信息-截止日期 + basicProcessInfoDTO.setProcessDescription(processDraft.getProcessDescription()) ; // 流程信息-流程说明 + basicTaskInfoDTO.setTaskId(processDraft.getTaskId()) ; // 任务id + basicTaskInfoDTO.setHandleText(processDraft.getHandleText()) ; // 流程审批信息-备注 + basicTaskInfoDTO.setHandleFile(processDraft.getHandleFile()) ; // 流程审批信息-附件 + processDraft.getUserId(); // 用户id + processInfoVO.setInfoJsonStr(processDraft.getInfoJsonStr()) ;//草稿信息json字符串 + + processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO); + processInfoVO.setBasicTaskInfoDTO(basicTaskInfoDTO); + return processInfoVO; + } + /** * @Author: liao * @Date: 2023/11/9 16:46 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index 89765d02..a8733284 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -62,7 +62,11 @@ public class ProcessProjectAssessService extends ServiceImpl queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { - return new ProcessInfoVO(); + if (StringUtils.isNotBlank(draftId)){ + ProcessInfoVO draft = processHandleService.getDraft(draftId); + return draft; + } + return new ProcessInfoVO<>(); } public void startProcess(ProcessInfoVO processInfoVO) {