研究生sop流程修改

sop-api/src/main/resources/cloudMarkSopFlow.bpmn

@@ -1,42 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test" id="m1626068475250" name="">
   <process id="CLOUD_MARK_SOP_FLOW" isExecutable="true" isClosed="false" processType="None">
-    <userTask id="f_usertask_cloudmark_inside_approve_3" name="项目内审" activiti:candidateUsers="${assigneeList3}" activiti:formKey="cloudmark_sop_inside_approve.form"></userTask>
+    <userTask id="f_usertask_cloudmark_inside_approve_region_3" name="大区经理内审" activiti:candidateUsers="${assigneeList3}" activiti:formKey="cloudmark_sop_inside_approve_region.form"></userTask>
     <endEvent id="f_usertask_cloudmark_end_0" name="结束"></endEvent>
     <userTask id="f_usertask_cloudmark_information_2" name="项目关键信息" activiti:candidateUsers="${assigneeList2}" activiti:formKey="cloudmark_sop_information.form"></userTask>
     <startEvent id="startevent1" name="Start" activiti:formKey="cloudmark_sop_start.form"></startEvent>
     <userTask id="f_usertask_cloudmark_first_1" name="项目初审" activiti:candidateUsers="${assigneeList1}" activiti:formKey="cloudmark_sop_first.form"></userTask>
     <sequenceFlow id="flow6" sourceRef="startevent1" targetRef="f_usertask_cloudmark_first_1"></sequenceFlow>
     <sequenceFlow id="flow14" sourceRef="f_usertask_cloudmark_first_1" targetRef="f_usertask_cloudmark_information_2"></sequenceFlow>
-    <userTask id="f_usertask_cloudmark_device_out_5" name="设备出库登记" activiti:candidateUsers="${assigneeList5}" activiti:formKey="cloudmark_sop_device_out.form"></userTask>
-    <userTask id="f_usertask_cloudmark_scan_ready_6" name="扫描准备" activiti:candidateUsers="${assigneeList6}" activiti:formKey="cloudmark_sop_scan_ready.form"></userTask>
-    <sequenceFlow id="flow22" sourceRef="f_usertask_cloudmark_device_out_5" targetRef="f_usertask_cloudmark_scan_ready_6"></sequenceFlow>
-    <userTask id="f_usertask_cloudmark_check_final_7" name="校验收尾" activiti:candidateUsers="${assigneeList7}" activiti:formKey="cloudmark_sop_check_final.form"></userTask>
-    <userTask id="f_usertask_cloudmark_mark_prep_8" name="评卷准备" activiti:candidateUsers="${assigneeList8}" activiti:formKey="cloudmark_sop_mark_prep.form"></userTask>
-    <userTask id="f_usertask_cloudmark_mark_final_10" name="评卷收尾" activiti:candidateUsers="${assigneeList10}" activiti:formKey="cloudmark_sop_mark_final.form"></userTask>
-    <userTask id="f_usertask_cloudmark_device_in_11" name="设备入库登记" activiti:candidateUsers="${assigneeList11}" activiti:formKey="cloudmark_sop_device_in.form"></userTask>
-    <sequenceFlow id="flow28" sourceRef="f_usertask_cloudmark_device_in_11" targetRef="f_usertask_cloudmark_end_0"></sequenceFlow>
-    <sequenceFlow id="flow29" sourceRef="f_usertask_cloudmark_mark_final_10" targetRef="f_usertask_cloudmark_device_in_11"></sequenceFlow>
-    <userTask id="f_usertask_cloudmark_env_test_4" name="现场环境测试" activiti:candidateUsers="${assigneeList4}" activiti:formKey="cloudmark_sop_env_test.form"></userTask>
-    <sequenceFlow id="flow31" sourceRef="f_usertask_cloudmark_env_test_4" targetRef="f_usertask_cloudmark_device_out_5"></sequenceFlow>
-    <sequenceFlow id="flow32" sourceRef="f_usertask_cloudmark_scan_ready_6" targetRef="f_usertask_cloudmark_check_final_7"></sequenceFlow>
-    <sequenceFlow id="flow33" sourceRef="f_usertask_cloudmark_check_final_7" targetRef="f_usertask_cloudmark_mark_prep_8"></sequenceFlow>
-    <userTask id="f_usertask_cloudmark_mark_check_9" name="成绩复核" activiti:candidateUsers="${assigneeList9}" activiti:formKey="cloudmark_sop_mark_check.form"></userTask>
-    <sequenceFlow id="flow34" sourceRef="f_usertask_cloudmark_mark_prep_8" targetRef="f_usertask_cloudmark_mark_check_9"></sequenceFlow>
-    <sequenceFlow id="flow35" sourceRef="f_usertask_cloudmark_mark_check_9" targetRef="f_usertask_cloudmark_mark_final_10"></sequenceFlow>
-    <sequenceFlow id="flow36" sourceRef="f_usertask_cloudmark_information_2" targetRef="f_usertask_cloudmark_inside_approve_3"></sequenceFlow>
+    <userTask id="f_usertask_cloudmark_device_out_6" name="设备出库登记" activiti:candidateUsers="${assigneeList6}" activiti:formKey="cloudmark_sop_device_out.form"></userTask>
+    <userTask id="f_usertask_cloudmark_scan_ready_7" name="扫描准备" activiti:candidateUsers="${assigneeList7}" activiti:formKey="cloudmark_sop_scan_ready.form"></userTask>
+    <sequenceFlow id="flow22" sourceRef="f_usertask_cloudmark_device_out_6" targetRef="f_usertask_cloudmark_scan_ready_7"></sequenceFlow>
+    <userTask id="f_usertask_cloudmark_check_final_8" name="校验收尾" activiti:candidateUsers="${assigneeList8}" activiti:formKey="cloudmark_sop_check_final.form"></userTask>
+    <userTask id="f_usertask_cloudmark_mark_prep_9" name="评卷准备" activiti:candidateUsers="${assigneeList9}" activiti:formKey="cloudmark_sop_mark_prep.form"></userTask>
+    <userTask id="f_usertask_cloudmark_mark_final_11" name="评卷收尾" activiti:candidateUsers="${assigneeList11}" activiti:formKey="cloudmark_sop_mark_final.form"></userTask>
+    <userTask id="f_usertask_cloudmark_device_in_12" name="设备入库登记" activiti:candidateUsers="${assigneeList12}" activiti:formKey="cloudmark_sop_device_in.form"></userTask>
+    <sequenceFlow id="flow28" sourceRef="f_usertask_cloudmark_device_in_12" targetRef="f_usertask_cloudmark_end_0"></sequenceFlow>
+    <sequenceFlow id="flow29" sourceRef="f_usertask_cloudmark_mark_final_11" targetRef="f_usertask_cloudmark_device_in_12"></sequenceFlow>
+    <userTask id="f_usertask_cloudmark_env_test_5" name="现场环境测试" activiti:candidateUsers="${assigneeList5}" activiti:formKey="cloudmark_sop_env_test.form"></userTask>
+    <sequenceFlow id="flow31" sourceRef="f_usertask_cloudmark_env_test_5" targetRef="f_usertask_cloudmark_device_out_6"></sequenceFlow>
+    <sequenceFlow id="flow32" sourceRef="f_usertask_cloudmark_scan_ready_7" targetRef="f_usertask_cloudmark_check_final_8"></sequenceFlow>
+    <sequenceFlow id="flow33" sourceRef="f_usertask_cloudmark_check_final_8" targetRef="f_usertask_cloudmark_mark_prep_9"></sequenceFlow>
+    <userTask id="f_usertask_cloudmark_mark_check_10" name="成绩复核" activiti:candidateUsers="${assigneeList10}" activiti:formKey="cloudmark_sop_mark_check.form"></userTask>
+    <sequenceFlow id="flow34" sourceRef="f_usertask_cloudmark_mark_prep_9" targetRef="f_usertask_cloudmark_mark_check_10"></sequenceFlow>
+    <sequenceFlow id="flow35" sourceRef="f_usertask_cloudmark_mark_check_10" targetRef="f_usertask_cloudmark_mark_final_11"></sequenceFlow>
+    <sequenceFlow id="flow36" sourceRef="f_usertask_cloudmark_information_2" targetRef="f_usertask_cloudmark_inside_approve_engineer_4"></sequenceFlow>
     <exclusiveGateway id="exclusivegateway1" name="Exclusive Gateway"></exclusiveGateway>
-    <sequenceFlow id="flow37" sourceRef="f_usertask_cloudmark_inside_approve_3" targetRef="exclusivegateway1"></sequenceFlow>
-    <sequenceFlow id="flow38" name="通过" sourceRef="exclusivegateway1" targetRef="f_usertask_cloudmark_env_test_4">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_cloudmark_env_test_4'}]]></conditionExpression>
-    </sequenceFlow>
+    <sequenceFlow id="flow37" sourceRef="f_usertask_cloudmark_inside_approve_engineer_4" targetRef="exclusivegateway1"></sequenceFlow>
     <sequenceFlow id="flow39" name="驳回" sourceRef="exclusivegateway1" targetRef="f_usertask_cloudmark_information_2">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_cloudmark_information_2'}]]></conditionExpression>
     </sequenceFlow>
+    <userTask id="f_usertask_cloudmark_inside_approve_engineer_4" name="工程师内审" activiti:candidateUsers="${assigneeList4}" activiti:formKey="cloudmark_sop_inside_approve_engineer.form"></userTask>
+    <sequenceFlow id="flow40" name="通过" sourceRef="exclusivegateway1" targetRef="f_usertask_cloudmark_inside_approve_engineer_4">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_cloudmark_inside_approve_engineer_4'}]]></conditionExpression>
+    </sequenceFlow>
+    <exclusiveGateway id="exclusivegateway2" name="Exclusive Gateway"></exclusiveGateway>
+    <sequenceFlow id="flow41" sourceRef="f_usertask_cloudmark_inside_approve_engineer_4" targetRef="exclusivegateway2"></sequenceFlow>
+    <sequenceFlow id="flow42" name="通过" sourceRef="exclusivegateway2" targetRef="f_usertask_cloudmark_env_test_5">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_cloudmark_env_test_5'}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow43" name="驳回" sourceRef="exclusivegateway2" targetRef="f_usertask_cloudmark_information_2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${approve == 'f_usertask_cloudmark_information_2'}]]></conditionExpression>
+    </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_CLOUD_MARK_SOP_FLOW">
     <bpmndi:BPMNPlane bpmnElement="CLOUD_MARK_SOP_FLOW" id="BPMNPlane_CLOUD_MARK_SOP_FLOW">
-      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_inside_approve_3" id="BPMNShape_f_usertask_cloudmark_inside_approve_3">
+      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_inside_approve_region_3" id="BPMNShape_f_usertask_cloudmark_inside_approve_region_3">
         <omgdc:Bounds height="55.0" width="85.0" x="456.0" y="20.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_end_0" id="BPMNShape_f_usertask_cloudmark_end_0">
@@ -51,33 +60,39 @@
       <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_first_1" id="BPMNShape_f_usertask_cloudmark_first_1">
         <omgdc:Bounds height="55.0" width="85.0" x="140.0" y="20.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_device_out_5" id="BPMNShape_f_usertask_cloudmark_device_out_5">
+      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_device_out_6" id="BPMNShape_f_usertask_cloudmark_device_out_6">
         <omgdc:Bounds height="55.0" width="85.0" x="456.0" y="141.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_scan_ready_6" id="BPMNShape_f_usertask_cloudmark_scan_ready_6">
+      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_scan_ready_7" id="BPMNShape_f_usertask_cloudmark_scan_ready_7">
         <omgdc:Bounds height="55.0" width="85.0" x="299.0" y="141.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_check_final_7" id="BPMNShape_f_usertask_cloudmark_check_final_7">
+      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_check_final_8" id="BPMNShape_f_usertask_cloudmark_check_final_8">
         <omgdc:Bounds height="55.0" width="85.0" x="142.0" y="141.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_mark_prep_8" id="BPMNShape_f_usertask_cloudmark_mark_prep_8">
+      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_mark_prep_9" id="BPMNShape_f_usertask_cloudmark_mark_prep_9">
         <omgdc:Bounds height="55.0" width="85.0" x="10.0" y="141.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_mark_final_10" id="BPMNShape_f_usertask_cloudmark_mark_final_10">
+      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_mark_final_11" id="BPMNShape_f_usertask_cloudmark_mark_final_11">
         <omgdc:Bounds height="55.0" width="85.0" x="150.0" y="260.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_device_in_11" id="BPMNShape_f_usertask_cloudmark_device_in_11">
+      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_device_in_12" id="BPMNShape_f_usertask_cloudmark_device_in_12">
         <omgdc:Bounds height="55.0" width="85.0" x="299.0" y="260.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_env_test_4" id="BPMNShape_f_usertask_cloudmark_env_test_4">
+      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_env_test_5" id="BPMNShape_f_usertask_cloudmark_env_test_5">
         <omgdc:Bounds height="55.0" width="85.0" x="620.0" y="141.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_mark_check_9" id="BPMNShape_f_usertask_cloudmark_mark_check_9">
+      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_mark_check_10" id="BPMNShape_f_usertask_cloudmark_mark_check_10">
         <omgdc:Bounds height="55.0" width="85.0" x="10.0" y="260.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="exclusivegateway1" id="BPMNShape_exclusivegateway1">
         <omgdc:Bounds height="40.0" width="40.0" x="642.0" y="27.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="f_usertask_cloudmark_inside_approve_engineer_4" id="BPMNShape_f_usertask_cloudmark_inside_approve_engineer_4">
+        <omgdc:Bounds height="55.0" width="85.0" x="780.0" y="20.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="exclusivegateway2" id="BPMNShape_exclusivegateway2">
+        <omgdc:Bounds height="40.0" width="40.0" x="802.0" y="148.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
         <omgdi:waypoint x="65.0" y="47.0"></omgdi:waypoint>
         <omgdi:waypoint x="140.0" y="47.0"></omgdi:waypoint>
@@ -120,18 +135,11 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow36" id="BPMNEdge_flow36">
         <omgdi:waypoint x="375.0" y="47.0"></omgdi:waypoint>
-        <omgdi:waypoint x="456.0" y="47.0"></omgdi:waypoint>
+        <omgdi:waypoint x="780.0" y="47.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow37" id="BPMNEdge_flow37">
-        <omgdi:waypoint x="541.0" y="47.0"></omgdi:waypoint>
-        <omgdi:waypoint x="642.0" y="47.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow38" id="BPMNEdge_flow38">
-        <omgdi:waypoint x="662.0" y="67.0"></omgdi:waypoint>
-        <omgdi:waypoint x="662.0" y="141.0"></omgdi:waypoint>
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds height="16.0" width="22.0" x="662.0" y="67.0"></omgdc:Bounds>
-        </bpmndi:BPMNLabel>
+        <omgdi:waypoint x="780.0" y="47.0"></omgdi:waypoint>
+        <omgdi:waypoint x="682.0" y="47.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow39" id="BPMNEdge_flow39">
         <omgdi:waypoint x="662.0" y="67.0"></omgdi:waypoint>
@@ -142,6 +150,31 @@
           <omgdc:Bounds height="16.0" width="22.0" x="662.0" y="67.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow40" id="BPMNEdge_flow40">
+        <omgdi:waypoint x="682.0" y="47.0"></omgdi:waypoint>
+        <omgdi:waypoint x="780.0" y="47.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="16.0" width="100.0" x="682.0" y="47.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow41" id="BPMNEdge_flow41">
+        <omgdi:waypoint x="822.0" y="75.0"></omgdi:waypoint>
+        <omgdi:waypoint x="822.0" y="148.0"></omgdi:waypoint>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow42" id="BPMNEdge_flow42">
+        <omgdi:waypoint x="802.0" y="168.0"></omgdi:waypoint>
+        <omgdi:waypoint x="705.0" y="168.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="16.0" width="100.0" x="802.0" y="168.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow43" id="BPMNEdge_flow43">
+        <omgdi:waypoint x="822.0" y="148.0"></omgdi:waypoint>
+        <omgdi:waypoint x="332.0" y="75.0"></omgdi:waypoint>
+        <bpmndi:BPMNLabel>
+          <omgdc:Bounds height="16.0" width="100.0" x="822.0" y="148.0"></omgdc:Bounds>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </definitions>

sop-api/src/main/resources/cloudmark_sop_start.form

@@ -1 +1 @@
-{"approveRejectMap":{"f_usertask_cloudmark_inside_approve_3":[{"afterFlowTaskKey":"f_usertask_cloudmark_information_2","setup":2}]}}
+{"approveRejectMap":{"f_usertask_cloudmark_inside_approve_region_3":[{"afterFlowTaskKey":"f_usertask_cloudmark_information_2","setup":2}],"f_usertask_cloudmark_inside_approve_engineer_4":[{"afterFlowTaskKey":"f_usertask_cloudmark_information_2","setup":2}]}}

sop-business/src/main/java/com/qmth/sop/business/entity/TDFormWidget.java

@@ -94,7 +94,7 @@ public class TDFormWidget implements Serializable {
     private Integer formSetup;
 
     @ApiModelProperty(value = "处理时限，0：不处理，1：可处理")
-    private Boolean handleTime;
+    private Boolean handle;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "创建人")
@@ -144,12 +144,12 @@ public class TDFormWidget implements Serializable {
         this.formSetup = formSetup;
     }
 
-    public Boolean getHandleTime() {
-        return handleTime;
+    public Boolean getHandle() {
+        return handle;
     }
 
-    public void setHandleTime(Boolean handleTime) {
-        this.handleTime = handleTime;
+    public void setHandle(Boolean handle) {
+        this.handle = handle;
     }
 
     public String getOptions() {

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -1125,4 +1125,15 @@ SET name='编辑', url='Edit', `type`='LINK', parent_id=41, `sequence`=6, proper
 WHERE id=3037;
 UPDATE sys_privilege
 SET name='编辑', url='Edit', `type`='LINK', parent_id=42, `sequence`=6, property='AUTH', related='3047,3048', enable=1, default_auth=0, front_display=1
-WHERE id=3039;
+WHERE id=3039;
+
+--2023.9.13update
+UPDATE sys_privilege
+SET name='新增违规 ', url='AddViolation', `type`='LINK', parent_id=41, `sequence`=4, property='AUTH', related='1025', enable=1, default_auth=0, front_display=1
+WHERE id=178;
+UPDATE sys_privilege
+SET name='新增违规 ', url='AddViolation', `type`='LINK', parent_id=42, `sequence`=3, property='AUTH', related='1025', enable=1, default_auth=0, front_display=1
+WHERE id=186;
+
+ALTER TABLE t_d_form_widget CHANGE COLUMN handle_time handle TINYINT DEFAULT 0
+    COMMENT '处理时限，0：不处理，1：可处理' NOT NULL;

sop-business/src/main/resources/mapper/TBSopInfoMapper.xml

@@ -73,9 +73,9 @@
                tfcf.version,
                cast(tfcf.flow_deployment_id as char) as flowDeploymentId,
                cast(art.PROC_INST_ID_ as char) as flowId,
-               art.NAME_ as taskName,
-               art.TASK_DEF_KEY_ as taskDefKey,
-               cast(art.ID_ as char) as taskId,
+               (select group_concat(art.NAME_) from ACT_RU_TASK art where art.PROC_INST_ID_ = tffa.flow_id) as taskName,
+               (select group_concat(art.TASK_DEF_KEY_) from ACT_RU_TASK art where art.PROC_INST_ID_ = tffa.flow_id) as taskDefKey,
+               (select group_concat(cast(art.ID_ as char)) from ACT_RU_TASK art where art.PROC_INST_ID_ = tffa.flow_id) as taskId,
                (select group_concat(us1.real_name SEPARATOR ';') from sys_user us1
                 where find_in_set(us1.id, (select tffl.pend_approve_id from t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id order by tffl.create_time desc limit 1))) as pendApproveName
                 <if test="fieldName != null and fieldName != ''">