hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-01 02:38:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

仿钉钉流程设计- 会签按通过比率

Browse Source
This commit is contained in:
jason
2024-06-08 08:20:20 +08:00
parent 12108e7365
commit 5c2fcdce15
5 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmApproveMethodEnum.java
View File

@@ -16,7 +16,7 @@ public enum BpmApproveMethodEnum {
SINGLE_PERSON_APPROVE(1, "单人审批"),
ALL_APPROVE(2, "多人会签(需所有审批人同意)"), // 会签
APPROVE_BY_RATIO(3, "多人会签(按比例投票)"), // 会签（按比例投票）
APPROVE_BY_RATIO(3, "多人会签(按通过比例)"), // 会签（按通过比例）
ANY_APPROVE_ALL_REJECT(4, "多人会签(通过只需一人,拒绝需要全员)"), // 会签（通过只需一人，拒绝需要全员）
ANY_APPROVE(5, "多人或签(一名审批人通过即可)"), // 或签（通过只需一人，拒绝只需一人）
SEQUENTIAL_APPROVE(6, "依次审批"); // 依次审批

5
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnModelConstants.java
View File

@@ -55,6 +55,11 @@ public interface BpmnModelConstants {
*/
String USER_TASK_APPROVE_METHOD = "approveMethod";
/**
* BPMN UserTask 的扩展属性，当审批方式为按通过比例时, 标记会签通过比例
*/
String USER_TASK_APPROVE_RATIO = "approveRatio";
/**
* BPMN ExtensionElement 的扩展属性，用于标记 服务任务附属的用户任务 Id
*/

20
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/expression/CompleteByRejectCountExpression.java
View File

@@ -16,7 +16,9 @@ import java.util.Objects;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.bpm.enums.definition.BpmApproveMethodEnum.ANY_APPROVE_ALL_REJECT;
import static cn.iocoder.yudao.module.bpm.enums.definition.BpmApproveMethodEnum.APPROVE_BY_RATIO;
import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants.USER_TASK_APPROVE_METHOD;
import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants.USER_TASK_APPROVE_RATIO;
/**
* 按拒绝人数计算会签的完成条件的流程表达式实现
@@ -58,8 +60,24 @@ public class CompleteByRejectCountExpression {
}
return false;
}
} else if (Objects.equals(APPROVE_BY_RATIO.getMethod(), approveMethod)) {
Integer approveRatio = NumberUtils.parseInt(BpmnModelUtils.parseExtensionElement(flowElement, USER_TASK_APPROVE_RATIO));
Assert.notNull(approveRatio, "通过比例不能空");
double approvePct = approveRatio / (double) 100;
double realApprovePct = (double) agreeCount / nrOfInstances;
// 判断通过比例
if (realApprovePct >= approvePct) {
return true;
}
double rejectPct = (100 - approveRatio) / (double) 100;
double realRejectPct = (double) rejectCount / nrOfInstances;
// 判断拒绝比例
if (realRejectPct >= rejectPct) {
execution.setVariable(String.format("%s_reject", flowElement.getId()), Boolean.TRUE);
return true;
}
return false;
}
// TODO 多人会签(按比例投票)
log.error("[completionCondition] 按拒绝人数计算会签的完成条件的审批方式[{}]，配置有误", approveMethod);
throw exception(GlobalErrorCodeConstants.ERROR_CONFIGURATION);
}

7
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/simple/SimpleModelUserTaskConfig.java
View File

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.bpm.framework.flowable.core.simple;
import cn.iocoder.yudao.module.bpm.enums.definition.BpmApproveMethodEnum;
import cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskRejectHandlerType;
import lombok.Data;
@@ -30,10 +31,14 @@ public class SimpleModelUserTaskConfig {
private List<Map<String,String>> fieldsPermission;
/**
* 审批方式
* 审批方式 {@link BpmApproveMethodEnum }
*/
private Integer approveMethod;
/**
* 通过比例 当审批方式为 多人会签(按通过比例) 需设置
*/
private Integer approveRatio;
/**
* 超时处理
*/

11
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
View File

@@ -493,7 +493,7 @@ public class SimpleModelUtils {
// 添加表单字段权限属性元素
addFormFieldsPermission(userTaskConfig.getFieldsPermission(), userTask);
// 处理多实例
processMultiInstanceLoopCharacteristics(userTaskConfig.getApproveMethod(), userTask);
processMultiInstanceLoopCharacteristics(userTaskConfig.getApproveMethod(), userTaskConfig.getApproveRatio(), userTask);
// 添加任务被拒绝的处理元素
addTaskRejectElements(userTaskConfig.getRejectHandler(), userTask);
return userTask;
@@ -507,7 +507,7 @@ public class SimpleModelUtils {
addExtensionElement(userTask, USER_TASK_REJECT_RETURN_TASK_ID, rejectHandler.getReturnNodeId());
}
private static void processMultiInstanceLoopCharacteristics(Integer approveMethod, UserTask userTask) {
private static void processMultiInstanceLoopCharacteristics(Integer approveMethod, Integer approveRatio, UserTask userTask) {
BpmApproveMethodEnum bpmApproveMethodEnum = BpmApproveMethodEnum.valueOf(approveMethod);
if (bpmApproveMethodEnum == null || bpmApproveMethodEnum == BpmApproveMethodEnum.SINGLE_PERSON_APPROVE) {
return;
@@ -533,8 +533,13 @@ public class SimpleModelUtils {
} else if (bpmApproveMethodEnum == BpmApproveMethodEnum.ANY_APPROVE_ALL_REJECT ){
multiInstanceCharacteristics.setCompletionCondition(COMPLETE_BY_REJECT_COUNT_EXPRESSION);
multiInstanceCharacteristics.setSequential(false);
} else if (bpmApproveMethodEnum == BpmApproveMethodEnum.APPROVE_BY_RATIO) {
multiInstanceCharacteristics.setCompletionCondition(COMPLETE_BY_REJECT_COUNT_EXPRESSION);
multiInstanceCharacteristics.setSequential(false);
Assert.notNull(approveRatio, "通过比例不能为空");
// 添加通过比例的扩展属性
addExtensionElement(userTask, BpmnModelConstants.USER_TASK_APPROVE_RATIO, approveRatio.toString());
}
// TODO 会签(按比例投票 )
userTask.setLoopCharacteristics(multiInstanceCharacteristics);
}