abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 调整加签，减签校验

Browse Source
This commit is contained in:
gssong 2024-12-08 12:07:05 +08:00
parent a9572ad4ac
commit 4b2faf193b
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java
View File

@ -28,4 +28,24 @@ public interface FlowConstant {
*/ */
String TASK_ID = "taskId"; String TASK_ID = "taskId";
/**
* 委托
*/
String DELEGATE_TASK = "delegateTask";
/**
* 转办
*/
String TRANSFER_TASK = "transferTask";
/**
* 加签
*/
String ADD_SIGNATURE = "addSignature";
/**
* 减签
*/
String REDUCTION_SIGNATURE = "reductionSignature";
} }

21
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
View File

@ -49,6 +49,7 @@ import org.dromara.workflow.utils.WorkflowUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -540,15 +541,15 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
// 根据操作类型构建 FlowParams // 根据操作类型构建 FlowParams
switch (taskOperation) { switch (taskOperation) {
case "delegateTask", "transferTask" -> { case DELEGATE_TASK, TRANSFER_TASK -> {
ValidatorUtils.validate(bo, AddGroup.class); ValidatorUtils.validate(bo, AddGroup.class);
flowParams.addHandlers(Collections.singletonList(bo.getUserId())); flowParams.addHandlers(Collections.singletonList(bo.getUserId()));
} }
case "addSignature" -> { case ADD_SIGNATURE -> {
ValidatorUtils.validate(bo, EditGroup.class); ValidatorUtils.validate(bo, EditGroup.class);
flowParams.addHandlers(bo.getUserIds()); flowParams.addHandlers(bo.getUserIds());
} }
case "reductionSignature" -> { case REDUCTION_SIGNATURE -> {
ValidatorUtils.validate(bo, EditGroup.class); ValidatorUtils.validate(bo, EditGroup.class);
flowParams.reductionHandlers(bo.getUserIds()); flowParams.reductionHandlers(bo.getUserIds());
} }
@ -559,25 +560,31 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
} }
Long taskId = bo.getTaskId(); Long taskId = bo.getTaskId();
FlowTaskVo flowTaskVo = selectById(taskId);
if ("addSignature".equals(taskOperation) || "reductionSignature".equals(taskOperation)) {
if (flowTaskVo.getNodeRatio().compareTo(BigDecimal.ZERO) == 0) {
throw new ServiceException(flowTaskVo.getNodeName() + "不是会签节点！");
}
}
// 设置任务状态并执行对应的任务操作 // 设置任务状态并执行对应的任务操作
switch (taskOperation) { switch (taskOperation) {
//委派任务 //委派任务
case "delegateTask" -> { case DELEGATE_TASK -> {
flowParams.hisStatus(TaskStatusEnum.DEPUTE.getStatus()); flowParams.hisStatus(TaskStatusEnum.DEPUTE.getStatus());
return taskService.depute(taskId, flowParams); return taskService.depute(taskId, flowParams);
} }
//转办任务 //转办任务
case "transferTask" -> { case TRANSFER_TASK -> {
flowParams.hisStatus(TaskStatusEnum.TRANSFER.getStatus()); flowParams.hisStatus(TaskStatusEnum.TRANSFER.getStatus());
return taskService.transfer(taskId, flowParams); return taskService.transfer(taskId, flowParams);
} }
//加签，增加办理人 //加签，增加办理人
case "addSignature" -> { case ADD_SIGNATURE -> {
flowParams.hisStatus(TaskStatusEnum.SIGN.getStatus()); flowParams.hisStatus(TaskStatusEnum.SIGN.getStatus());
return taskService.addSignature(taskId, flowParams); return taskService.addSignature(taskId, flowParams);
} }
//减签，减少办理人 //减签，减少办理人
case "reductionSignature" -> { case REDUCTION_SIGNATURE -> {
flowParams.hisStatus(TaskStatusEnum.SIGN_OFF.getStatus()); flowParams.hisStatus(TaskStatusEnum.SIGN_OFF.getStatus());
return taskService.reductionSignature(taskId, flowParams); return taskService.reductionSignature(taskId, flowParams);
} }