代码优化

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java

@@ -356,7 +356,7 @@ public class ActTaskServiceImpl implements IActTaskService {
             );
         });
 
-        queryWrapper.orderByAsc("CASE WHEN t.taskType = 'running' THEN 1 ELSE 2 END");
+        queryWrapper.orderByAsc("FIELD(t.taskType, 'finished', 'running')"); // 按指定顺序排序
         Page<TaskVo> page = actTaskMapper.getTaskByPage(pageQuery.build(), queryWrapper);
 
         List<TaskVo> taskList = page.getRecords();

ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml

@@ -28,7 +28,7 @@
         <result property="processDefinitionKey" column="processDefinitionKey"/>
         <result property="processDefinitionVersion" column="processDefinitionVersion"/>
         <result property="businessKey" column="BUSINESS_KEY_"/>
-        <result property="businessKey" column="taskType"/>
+        <result property="taskType" column="taskType"/>
     </resultMap>
     <select id="getTaskWaitByPage" resultMap="TaskVoResult">
         select *
@@ -62,9 +62,25 @@
     <select id="getTaskByPage" resultMap="TaskVoResult">
         select *
         from (
-                 SELECT
-                     'running' as taskType,
-                     RES.*,
+                 SELECT 'running'    AS taskType,
+                        RES.ID_,
+                        RES.NAME_,
+                        RES.DESCRIPTION_,
+                        RES.PRIORITY_,
+                        RES.OWNER_,
+                        RES.ASSIGNEE_,
+                        RES.PROC_INST_ID_,
+                        RES.EXECUTION_ID_,
+                        RES.TASK_DEF_ID_,
+                        RES.PROC_DEF_ID_,
+                        RES.CREATE_TIME_,
+                        null         AS START_TIME_,
+                        RES.TASK_DEF_KEY_,
+                        RES.DUE_DATE_,
+                        RES.CATEGORY_,
+                        null         AS PARENT_TASK_ID_,
+                        RES.TENANT_ID_,
+                        null         AS CLAIM_TIME,
                         AHP.BUSINESS_STATUS_,
                         AHP.BUSINESS_KEY_,
                         ARP.NAME_    AS processDefinitionName,
@@ -78,9 +94,25 @@
 
                  UNION ALL
 
-                 SELECT
-                     'finished' as taskType,
-                     HTI.*,
+                 SELECT 'finished'   as taskType,
+                        HTI.ID_,
+                        null         AS NAME_,
+                        HTI.DESCRIPTION_,
+                        HTI.PRIORITY_,
+                        HTI.OWNER_,
+                        HTI.ASSIGNEE_,
+                        HTI.PROC_INST_ID_,
+                        HTI.EXECUTION_ID_,
+                        HTI.TASK_DEF_ID_,
+                        HTI.PROC_DEF_ID_,
+                        null         AS CREATE_TIME_,
+                        HTI.START_TIME_,
+                        HTI.TASK_DEF_KEY_,
+                        HTI.DUE_DATE_,
+                        HTI.CATEGORY_,
+                        HTI.PARENT_TASK_ID_,
+                        HTI.TENANT_ID_,
+                        null         AS CLAIM_TIME,
                         AHP.BUSINESS_STATUS_,
                         AHP.BUSINESS_KEY_,
                         ARP.NAME_    AS processDefinitionName,
@@ -90,7 +122,8 @@
                  FROM ACT_HI_TASKINST HTI
                           INNER JOIN ACT_HI_PROCINST AHP ON HTI.PROC_INST_ID_ = AHP.PROC_INST_ID_
                           INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = HTI.PROC_DEF_ID_
-                 WHERE HTI.PARENT_TASK_ID_ IS NULL AND HTI.END_TIME_ IS NOT NULL
+                 WHERE HTI.PARENT_TASK_ID_ IS NULL
+                   AND HTI.END_TIME_ IS NOT NULL
              ) t
             ${ew.getCustomSqlSegment}
     </select>