From 596c51e5d9ef011a3a86bfdc19d6e31b1c7327f3 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sun, 25 Jun 2023 20:52:30 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E5=B7=B2=E5=8A=9E?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8E=92=E5=BA=8F=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/workflow/domain/vo/TaskVo.java    |  5 +++++
 .../workflow/service/impl/ActModelServiceImpl.java     | 10 ++++++++++
 .../workflow/service/impl/ActTaskServiceImpl.java      |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java
index dce733440..0410d8d46 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java
@@ -67,6 +67,11 @@ public class TaskVo {
      */
     private Date createTime;
 
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
     /**
      * 节点id
      */
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
index 5cae3f94b..fadab4713 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
@@ -347,6 +347,11 @@ public class ActModelServiceImpl implements IActModelService {
         }
     }
 
+    /**
+     * 查询用户
+     *
+     * @param filter 参数
+     */
     @Override
     public ResultListDataRepresentation getUsers(String filter) {
 
@@ -366,6 +371,11 @@ public class ActModelServiceImpl implements IActModelService {
         return new ResultListDataRepresentation(userRepresentations);
     }
 
+    /**
+     * 查询用户组
+     *
+     * @param filter 参数
+     */
     @Override
     public ResultListDataRepresentation getGroups(String filter) {
 
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
index 93a7e3226..df9e62582 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
@@ -196,7 +196,7 @@ public class ActTaskServiceImpl implements IActTaskService {
     public TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo) {
         String userId = String.valueOf(LoginHelper.getUserId());
         HistoricTaskInstanceQuery query = historyService.createHistoricTaskInstanceQuery()
-            .taskAssignee(userId).taskTenantId(TenantHelper.getTenantId()).finished().orderByHistoricTaskInstanceStartTime().asc();
+            .taskAssignee(userId).taskTenantId(TenantHelper.getTenantId()).finished().orderByHistoricTaskInstanceStartTime().desc();
         if (StringUtils.isNotBlank(taskBo.getName())) {
             query.taskNameLike("%" + taskBo.getName() + "%");
         }