From aec62975ba184a851ed10b0d88c6c63a57a47087 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 30 Jul 2024 12:47:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B3=E8=AF=B7=E5=92=8C?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=A1=B5=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/sgzb/app/domain/TmTask.java     |  3 ++
 .../resources/mapper/app/TmTaskMapper.xml     | 30 +++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
index 25d4dadf..fb9655aa 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
@@ -270,4 +270,7 @@ public class TmTask implements Serializable {
     private Integer souceByRefuse;
     private int souceBy;
 
+    /**0:update_time ASC 1:update_time DESC 2:task_status ASC 3:task_status DESC*/
+    private int orderStatus;
+
 }
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index 13dbf1cb..059f1d53 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -532,7 +532,15 @@
                tt.code like concat('%', #{record.keyWord}, '%'))
       </if>
       GROUP BY tt.task_id
-      ORDER BY tt.update_time DESC
+      order by
+      case when #{record.orderStatus} = 0 then tt.update_time
+            when #{record.orderStatus} = 1 then tt.update_time
+            when #{record.orderStatus} = 2 then tt.task_status
+            when #{record.orderStatus} = 3 then tt.task_status
+      end
+      <if test="record.orderStatus == 1 or record.orderStatus == 3">
+        desc
+      </if>
   </select>
 
   <select id="getAuditManageListByLeaseTmTask" resultType="com.bonus.sgzb.app.domain.TmTask">
@@ -593,7 +601,15 @@
           AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or tt.code like concat('%', #{record.keyWord}, '%'))
       </if>
       GROUP BY tt.task_id
-      ORDER BY tt.task_status,tt.update_time DESC
+      order by
+      case when #{record.orderStatus} = 0 then tt.update_time
+            when #{record.orderStatus} = 1 then tt.update_time
+            when #{record.orderStatus} = 2 then tt.task_status
+            when #{record.orderStatus} = 3 then tt.task_status
+      end
+      <if test="record.orderStatus == 1 or record.orderStatus == 3">
+        desc
+      </if>
   </select>
 
   <select id="getAuditListByLeaseInfo" resultType="com.bonus.sgzb.app.domain.LeaseApplyInfo">
@@ -1001,7 +1017,15 @@
            tt.code like concat('%', #{record.keyWord}, '%'))
     </if>
     GROUP BY tt.task_id
-    ORDER BY tt.update_time DESC
+    order by
+    case when #{record.orderStatus} = 0 then tt.update_time
+          when #{record.orderStatus} = 1 then tt.update_time
+          when #{record.orderStatus} = 2 then tt.task_status
+          when #{record.orderStatus} = 3 then tt.task_status
+    end
+    <if test="record.orderStatus == 1 or record.orderStatus == 3">
+      desc
+    </if>
   </select>
   <select id="getLeaseApplyDetailsByApply" resultType="com.bonus.sgzb.app.domain.LeaseApplyDetails">
     SELECT