feat: 企标复审流程转办驳回
This commit is contained in:
+1
-1
@@ -134,7 +134,7 @@ public class ESRecheckController {
|
|||||||
@ApiOperation(value="企标复审流程-转办", notes="企标复审流程-转办")
|
@ApiOperation(value="企标复审流程-转办", notes="企标复审流程-转办")
|
||||||
@PostMapping(value = "/transfer")
|
@PostMapping(value = "/transfer")
|
||||||
public Result<?> transfer(@RequestBody TransferVO transferVO) {
|
public Result<?> transfer(@RequestBody TransferVO transferVO) {
|
||||||
processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId());
|
recheckService.transfer(transferVO.getTaskId(), transferVO.getUserId());
|
||||||
return Result.OK();
|
return Result.OK();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+15
@@ -0,0 +1,15 @@
|
|||||||
|
package com.jero.modules.activiti.process.esRecheck.entity;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author: Mzaxd
|
||||||
|
* @Date: 2024/1/10 10:28
|
||||||
|
*/
|
||||||
|
public class RecheckTaskNameConstant {
|
||||||
|
|
||||||
|
public static final String STANDARD_ENGINEER_INIT = "标准化发起";
|
||||||
|
public static final String CONTACT_USER_DISTRIBUTE = "联络人下发";
|
||||||
|
public static final String DRAFTER_EDIT = "起草人填写意见";
|
||||||
|
public static final String DRAFTER_LEADER_APPROVAL = "起草人部长审批";
|
||||||
|
public static final String STANDARDIZATION_APPROVAL = "标准化审批";
|
||||||
|
|
||||||
|
}
|
||||||
+1
@@ -22,4 +22,5 @@ public interface ProcessEsRecheckService extends IService<ProcessEsRecheck> {
|
|||||||
|
|
||||||
void approval(ESRecheckDataVO recheckData, boolean pass);
|
void approval(ESRecheckDataVO recheckData, boolean pass);
|
||||||
|
|
||||||
|
void transfer(String taskId, String userId);
|
||||||
}
|
}
|
||||||
|
|||||||
+27
-3
@@ -8,11 +8,8 @@ import com.jero.common.constant.enums.YesOrNoEnum;
|
|||||||
import com.jero.common.exception.JeroBootException;
|
import com.jero.common.exception.JeroBootException;
|
||||||
import com.jero.modules.activiti.enums.ProcessTypeEnum;
|
import com.jero.modules.activiti.enums.ProcessTypeEnum;
|
||||||
import com.jero.modules.activiti.process.common.entity.CommonVO;
|
import com.jero.modules.activiti.process.common.entity.CommonVO;
|
||||||
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
|
|
||||||
import com.jero.modules.activiti.process.common.enums.ProcessType;
|
import com.jero.modules.activiti.process.common.enums.ProcessType;
|
||||||
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
|
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
|
||||||
import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish;
|
|
||||||
import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO;
|
|
||||||
import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck;
|
import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck;
|
||||||
import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
|
import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
|
||||||
import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
|
import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
|
||||||
@@ -24,13 +21,18 @@ import com.jero.modules.activiti.service.ProcessNodeLinkService;
|
|||||||
import com.jero.modules.sys.utils.UserUtils;
|
import com.jero.modules.sys.utils.UserUtils;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.activiti.engine.RuntimeService;
|
import org.activiti.engine.RuntimeService;
|
||||||
|
import org.activiti.engine.TaskService;
|
||||||
import org.activiti.engine.runtime.ProcessInstance;
|
import org.activiti.engine.runtime.ProcessInstance;
|
||||||
|
import org.activiti.engine.task.Task;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
|
||||||
|
import static com.jero.modules.activiti.process.esRecheck.entity.RecheckTaskNameConstant.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author ThinkBook
|
* @author ThinkBook
|
||||||
* @description 针对表【process_es_recheck(企业标准)】的数据库操作Service实现
|
* @description 针对表【process_es_recheck(企业标准)】的数据库操作Service实现
|
||||||
@@ -54,6 +56,9 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
|
|||||||
@Resource
|
@Resource
|
||||||
private IProcessHandleService processHandleService;
|
private IProcessHandleService processHandleService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private TaskService taskService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void startProcess(ESRecheckDataVO recheckData) {
|
public void startProcess(ESRecheckDataVO recheckData) {
|
||||||
// 执行流程发起前的操作
|
// 执行流程发起前的操作
|
||||||
@@ -244,6 +249,25 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
|
|||||||
actFlowCommonService.removeDraft(commonVO);
|
actFlowCommonService.removeDraft(commonVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void transfer(String taskId, String toUserId) {
|
||||||
|
// 判断是否是特殊节点,如果是特殊节点则需要替换流程变量
|
||||||
|
if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
|
||||||
|
throw new JeroBootException("taskId为空或任务不存在");
|
||||||
|
}
|
||||||
|
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
|
||||||
|
String taskName = task.getName();
|
||||||
|
switch (taskName) {
|
||||||
|
case DRAFTER_EDIT:
|
||||||
|
taskService.setVariable(taskId, "mainDraftUser", toUserId);
|
||||||
|
break;
|
||||||
|
case DRAFTER_LEADER_APPROVAL:
|
||||||
|
taskService.setVariable(taskId, "mainDraftUserLeader", toUserId);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
processHandleService.transfer(taskId, toUserId);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user