Browse Source

通过表单id返回流程节点信息

lamphua 10 months ago
parent
commit
af82a879a1

+ 7
- 2
oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java View File

1393
      */
1393
      */
1394
     @Override
1394
     @Override
1395
     public AjaxResult flowXmlAndNodeByFormIdAndName(String formId, String name) {
1395
     public AjaxResult flowXmlAndNodeByFormIdAndName(String formId, String name) {
1396
-        FlowVarInst flowVarInst =  flowVarInstMapper.selectProcInstByVar(formId);
1396
+        List<FlowVarInst> flowVarInst =  flowVarInstMapper.selectProcInstByVar(formId);
1397
         List<FlowProcDefDto> flowProcDefList = flowDeployMapper.selectDeployList(name);
1397
         List<FlowProcDefDto> flowProcDefList = flowDeployMapper.selectDeployList(name);
1398
-        return flowXmlAndNode(flowVarInst.getProcInstId(), flowProcDefList.get(0).getDeploymentId());
1398
+        AjaxResult result = flowXmlAndNode(flowVarInst.get(0).getProcInstId(), flowProcDefList.get(0).getDeploymentId());
1399
+        if (result.isSuccess()) {
1400
+            result.put("procInsId", flowVarInst.get(0).getProcInstId());
1401
+            result.put("deployId", flowProcDefList.get(0).getDeploymentId());
1402
+        }
1403
+        return result;
1399
     }
1404
     }
1400
 
1405
 
1401
     /**
1406
     /**

+ 3
- 1
oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowVarInstMapper.java View File

2
 
2
 
3
 import com.ruoyi.system.domain.FlowVarInst;
3
 import com.ruoyi.system.domain.FlowVarInst;
4
 
4
 
5
+import java.util.List;
6
+
5
 /**
7
 /**
6
  * 流程变量Mapper接口
8
  * 流程变量Mapper接口
7
  *
9
  *
16
      * @param formId 表单id
18
      * @param formId 表单id
17
      * @return 流程变量
19
      * @return 流程变量
18
      */
20
      */
19
-    public FlowVarInst selectProcInstByVar(String formId);
21
+    public List<FlowVarInst> selectProcInstByVar(String formId);
20
 
22
 
21
 }
23
 }

+ 3
- 1
oa-back/ruoyi-system/src/main/resources/mapper/flowable/FlowVarInstMapper.xml View File

8
         <result property="procInstId"    column="PROC_INST_ID_"    />
8
         <result property="procInstId"    column="PROC_INST_ID_"    />
9
         <result property="name"    column="NAME_"    />
9
         <result property="name"    column="NAME_"    />
10
         <result property="text"    column="TEXT_"    />
10
         <result property="text"    column="TEXT_"    />
11
+        <result property="createTime"    column="CREATE_TIME_"    />
11
     </resultMap>
12
     </resultMap>
12
 
13
 
13
     <sql id="selectFlowVarInstVo">
14
     <sql id="selectFlowVarInstVo">
14
-        select PROC_INST_ID_, NAME_, TEXT_ from act_hi_varinst
15
+        select PROC_INST_ID_, NAME_, TEXT_, CREATE_TIME_ from act_hi_varinst
15
     </sql>
16
     </sql>
16
 
17
 
17
     <select id="selectProcInstByVar" parameterType="FlowVarInst" resultMap="FlowVarInstResult">
18
     <select id="selectProcInstByVar" parameterType="FlowVarInst" resultMap="FlowVarInstResult">
19
         <where>
20
         <where>
20
             NAME_ = 'formId' and TEXT_ = #{param}
21
             NAME_ = 'formId' and TEXT_ = #{param}
21
         </where>
22
         </where>
23
+        order by CREATE_TIME_ asc
22
     </select>
24
     </select>
23
 
25
 
24
 </mapper>
26
 </mapper>

Loading…
Cancel
Save