update 项目合规评估流程-查询流程信息，返回草稿数据

2023-12-14 11:59:19 +08:00
parent 2e06ba3cdf
commit ac0a9fbc3a
3 changed files with 38 additions and 1 deletions
@@ -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
@@ -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<ProcessDraft> 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
@@ -62,7 +62,11 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
    }

    public ProcessInfoVO<ProcessProjectAssessVO> queryProcessInfoVO(String draftId, String processInstanceId, String taskId) {
-        return new ProcessInfoVO<ProcessProjectAssessVO>();
+         if (StringUtils.isNotBlank(draftId)){
+             ProcessInfoVO draft = processHandleService.getDraft(draftId);
+             return draft;
+         }
+        return new ProcessInfoVO<>();
    }

    public void startProcess(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO) {