查询已办流程表单时判断是否子流程,主流程

zlmy-modules/zlmy-boot/doc/v2.6.0/修改记录.md

@@ -91,4 +91,10 @@ hazardousTaskBLOrg hazardousTaskBLDept hazardousTaskConfinedSpace  hazardousTask
 
 # 新增流程图
 hazardousTaskStifling
-hazardousTaskBLLN2
+hazardousTaskBLLN2
\ No newline at end of file
+
+
+
+# 字典值修改
+update t_sys_dict_data set status = '0'
+where dict_data_id in('b125a6ee7b484f47bda53856ef71a4a1','e8225810471c448abcfca87842952d7d','2d3e648250cb4c27aae5383ce24383c0')
\ No newline at end of file

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/wf/dao/RuTaskDao.java

@@ -13,6 +13,8 @@ public interface RuTaskDao extends SuperDao<ActRuTask> {
 
     HisTask getHisTask(@Param("his") HisTaskListRequest his);
 
+    HisTask getTaskId(@Param("taskId")String taskId);
+
     List<Map> countToDo(@Param("userId") String userId, @Param("orgId") String orgId);
 
     IPage<TodoTask> selectToDoList(IPage<TodoTask> page, @Param("todo") TodoTaskSqlParam todoTaskSqlParam);

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/wf/service/impl/RuTaskServiceImpl.java

@@ -62,7 +62,14 @@ public class RuTaskServiceImpl implements RuTaskService {
 
     @Override
     public HisTask getHisTask(HisTaskListRequest hisTaskListRequest) {
-        return ruTaskMapper.getHisTask(hisTaskListRequest);
+        HisTask hisTask = ruTaskMapper.getHisTask(hisTaskListRequest);
+        //可能是查的子流程但传的流程id是主流程的
+        if(null == hisTask){
+            if(!StringUtils.isEmpty(hisTaskListRequest.getTaskId())){
+                hisTask = ruTaskMapper.getTaskId(hisTaskListRequest.getTaskId());
+            }
+        }
+        return hisTask;
     }
 
     /**

zlmy-modules/zlmy-boot/src/main/resources/mapper/workflow/RuTaskMapper.xml

@@ -44,6 +44,30 @@
         <if test="his.processInstanceId != null"> AND task.PROC_INST_ID_ = #{his.processInstanceId}</if>
     </select>
 
+    <select id="getTaskId" resultType="com.tongtech.tfw.workflow.apis.task.model.dto.HisTask">
+        SELECT
+        task.ID_ AS taskId,
+        task.NAME_ AS taskName,
+        task.START_TIME_ AS startTime,
+        task.END_TIME_ AS endTime,
+        task.FORM_KEY_ as formKey,
+        task.PROC_INST_ID_ AS processInstanceId,
+        task.PROC_DEF_ID_ AS processDefinitionId,
+        procdef.NAME_ AS processDefinitionName,
+        procdef.VERSION_ AS processDefinitionVersion,
+        procdef.DESCRIPTION_ as processDefinitionDescription,
+        usr.FIRST_ AS startUser,
+        hiproc.BUSINESS_KEY_ AS bizId
+        FROM
+        act_hi_taskinst task
+        LEFT JOIN act_hi_procinst hiproc ON task.PROC_INST_ID_ = hiproc.PROC_INST_ID_
+        LEFT JOIN act_re_procdef procdef ON task.PROC_DEF_ID_ = procdef.ID_
+        LEFT JOIN act_id_user usr ON hiproc.START_USER_ID_ = usr.ID_
+        WHERE
+        task.END_TIME_ IS NOT NULL
+        <if test="taskId != null"> AND task.ID_ =#{taskId}</if>
+    </select>
+
     <select id="countToDo" resultMap="countToDoResult">
         SELECT
             count(distinct task.ID_) as num,