From 8e393be98fdc57d7162b8ff4cef0ba578a415b07 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 30 Jul 2024 09:55:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BE=85=E5=8A=9E=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=BC=9A=E7=AD=BE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/activiti/entity/ProcessAll.java | 5 +++++ .../jero/modules/activiti/mapper/xml/ProcessAllMapper.xml | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java index 1fa980e6..8078adc7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java @@ -193,4 +193,9 @@ public class ProcessAll { @ApiModelProperty(value = "父任务id") @TableField(exist = false) private String parentTaskId; + + /**是否是会签节点*/ + @ApiModelProperty(value = "是否是会签节点") + @TableField(exist = false) + private String countersignFlag; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml index 5371b924..3c56bca1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessAllMapper.xml @@ -46,9 +46,11 @@ pa.prc_status, pa.end_time, pa.over_time, - pa.project_id + pa.project_id, + pn.countersign_flag from process_approval_record par left join process_all pa on pa.process_instance_id = par.process_instance_id + left join process_node pn on pn.xml_node_id = par.node_id ${ew.customSqlSegment}