feat: 企标离线变更流程转办驳回
This commit is contained in:
+1
-1
@@ -182,7 +182,7 @@ public class ProcessESInitChangeController {
|
|||||||
@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());
|
initChangeService.transfer(transferVO.getTaskId(), transferVO.getUserId());
|
||||||
return Result.OK();
|
return Result.OK();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+7
@@ -52,4 +52,11 @@ public interface ProcessEsInitChangeService extends IService<ProcessEsInitChange
|
|||||||
* @param standNo
|
* @param standNo
|
||||||
*/
|
*/
|
||||||
void autoStartProcessByRecheck(String standardNo);
|
void autoStartProcessByRecheck(String standardNo);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 转办
|
||||||
|
* @param taskId
|
||||||
|
* @param userId
|
||||||
|
*/
|
||||||
|
void transfer(String taskId, String userId);
|
||||||
}
|
}
|
||||||
|
|||||||
+16
-3
@@ -10,11 +10,8 @@ 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.CounterSignNodeNameConstants;
|
import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants;
|
||||||
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.esArchive.entity.ProcessEsArchive;
|
|
||||||
import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
|
|
||||||
import com.jero.modules.activiti.process.esInitChange.entity.EsInitChangeConstant;
|
import com.jero.modules.activiti.process.esInitChange.entity.EsInitChangeConstant;
|
||||||
import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
|
import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
|
||||||
import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
|
import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
|
||||||
@@ -42,6 +39,8 @@ import javax.annotation.Resource;
|
|||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import static com.jero.modules.activiti.process.esInitChange.entity.EsInitChangeConstant.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author ThinkBook
|
* @author ThinkBook
|
||||||
* @description 针对表【process_es_init_change(企标计划)】的数据库操作Service实现
|
* @description 针对表【process_es_init_change(企标计划)】的数据库操作Service实现
|
||||||
@@ -201,6 +200,20 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
|
|||||||
actFlowCommonService.updateProcessAll(processInstanceId, mainDraftUser, prcName, null, prcType, null);
|
actFlowCommonService.updateProcessAll(processInstanceId, mainDraftUser, prcName, null, prcType, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@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();
|
||||||
|
if (taskName.equals(STANDARDIZATION_CHECK)) {
|
||||||
|
taskService.setVariable(taskId, "standardizationApprovalUser", toUserId);
|
||||||
|
}
|
||||||
|
processHandleService.transfer(taskId, toUserId);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void approvalInitChange(InitChangeDataVO initChangeDataVO, boolean pass) {
|
public void approvalInitChange(InitChangeDataVO initChangeDataVO, boolean pass) {
|
||||||
String userId = UserUtils.getUserId();
|
String userId = UserUtils.getUserId();
|
||||||
|
|||||||
Reference in New Issue
Block a user