diff --git a/db/upgrade/add_default_opinion_to_node.sql b/db/upgrade/add_default_opinion_to_node.sql
new file mode 100644
index 0000000..e513636
--- /dev/null
+++ b/db/upgrade/add_default_opinion_to_node.sql
@@ -0,0 +1,8 @@
+-- 流程节点增加默认审批意见字段(双意见 + 条件变量)
+ALTER TABLE `ext_act_process_node` ADD COLUMN `default_opinion` varchar(500) NULL COMMENT '默认审批意见(条件变量=0时)' AFTER `allow_counter_sign_add_user`;
+ALTER TABLE `ext_act_process_node` ADD COLUMN `default_opinion2` varchar(500) NULL COMMENT '默认审批意见(条件变量=1时)' AFTER `default_opinion`;
+ALTER TABLE `ext_act_process_node` ADD COLUMN `default_opinion_var` varchar(100) NULL COMMENT '条件变量名' AFTER `default_opinion2`;
+
+ALTER TABLE `ext_act_process_node_deploy` ADD COLUMN `default_opinion` varchar(500) NULL COMMENT '默认审批意见(条件变量=0时)' AFTER `msg_status`;
+ALTER TABLE `ext_act_process_node_deploy` ADD COLUMN `default_opinion2` varchar(500) NULL COMMENT '默认审批意见(条件变量=1时)' AFTER `default_opinion`;
+ALTER TABLE `ext_act_process_node_deploy` ADD COLUMN `default_opinion_var` varchar(100) NULL COMMENT '条件变量名' AFTER `default_opinion2`;
diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/controller/ActTaskController.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/controller/ActTaskController.java
index b5510a2..da666c3 100644
--- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/controller/ActTaskController.java
+++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/bpm/controller/ActTaskController.java
@@ -340,6 +340,21 @@ public class ActTaskController {
map.put("rejectStatus", extActProcessNode.getRejectStatus());
//是否允许转办 1是0否
map.put("transferStatus", extActProcessNode.getTransferStatus());
+ //默认审批意见 — 根据条件变量选择
+ // 未填流程变量名 或 流程变量未找到时,默认使用 默认审批意见(变量=0)
+ String defaultOpinion = extActProcessNode.getDefaultOpinion();
+ String opinionVar = extActProcessNode.getDefaultOpinionVar();
+ if (oConvertUtils.isNotEmpty(opinionVar)) {
+ Object varValue = runtimeService.getVariable(task.getProcessInstanceId(), opinionVar);
+ if (varValue != null && "1".equals(String.valueOf(varValue))) {
+ defaultOpinion = extActProcessNode.getDefaultOpinion2();
+ }
+ }
+ map.put("defaultOpinion", defaultOpinion);
+ // 返回条件变量的 raw 值,供前端结合表单变量做二次解析 (extraVars > vars)
+ map.put("defaultOpinionVar", extActProcessNode.getDefaultOpinionVar());
+ map.put("defaultOpinionCond0", extActProcessNode.getDefaultOpinion());
+ map.put("defaultOpinionCond1", extActProcessNode.getDefaultOpinion2());
}
//--update--end------author:scott-----date:20220705-----for:【VUEN-1332】流程节点配置智能化-------------
diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/entity/ExtActProcessNode.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/entity/ExtActProcessNode.java
index ce3e5f7..efd46ac 100644
--- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/entity/ExtActProcessNode.java
+++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/entity/ExtActProcessNode.java
@@ -56,6 +56,12 @@ public class ExtActProcessNode implements Serializable {
private String rejectStatus;
/**会签节点是否允许加人0否 1允许*/
private String allowCounterSignAddUser;
+ /**默认审批意见(条件变量=0)*/
+ private String defaultOpinion;
+ /**默认审批意见(条件变量=1)*/
+ private String defaultOpinion2;
+ /**条件变量名*/
+ private String defaultOpinionVar;
//--update--end------author:scott-----date:20220705-----for:【VUEN-1332】流程节点配置智能化---------------
//--update--begin------ author: scott---date:20220908-----for: 节点扩展配置(存邮件\系统消息\钉钉推送的配置)---
diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/entity/ExtActProcessNodeDeployment.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/entity/ExtActProcessNodeDeployment.java
index 6808ad5..cf5165a 100644
--- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/entity/ExtActProcessNodeDeployment.java
+++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/entity/ExtActProcessNodeDeployment.java
@@ -51,6 +51,12 @@ public class ExtActProcessNodeDeployment implements Serializable {
private String selnextUserStatus;
/**是否支持消息通知1是0否*/
private String msgStatus;
+ /**默认审批意见(条件变量=0)*/
+ private String defaultOpinion;
+ /**默认审批意见(条件变量=1)*/
+ private String defaultOpinion2;
+ /**条件变量名*/
+ private String defaultOpinionVar;
//--update--end------author:scott-----date:20220705-----for:【VUEN-1332】流程节点配置智能化---------------
//--update--begin------ author: scott---date:20220908-----for: 节点扩展配置(存邮件\系统消息\钉钉推送的配置)---
diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/mapper/xml/ExtActProcessNodeMapper.xml b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/mapper/xml/ExtActProcessNodeMapper.xml
index dc29e32..e4a3b73 100644
--- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/mapper/xml/ExtActProcessNodeMapper.xml
+++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/extbpm/process/mapper/xml/ExtActProcessNodeMapper.xml
@@ -14,9 +14,9 @@
-
+
-
+