From 13faeb6dbb748f82c1c408aab51bd43a2e15e5a0 Mon Sep 17 00:00:00 2001
From: panxinyu-YUYwp <youremail@example.com>
Date: Wed, 30 Sep 2026 11:53:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E5=AD=98?=
 =?UTF-8?q?=E6=A1=A3=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=90=88=E5=90=8C=E6=97=A5?=
 =?UTF-8?q?=E4=B8=8E=E5=90=88=E5=90=8C=E6=97=A5=E6=9C=9F=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/contract/entity/ContractEntity.java      |  6 ++++++
 .../resources/mapper/contract/ContractMapper.xml     | 12 +++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/contract/entity/ContractEntity.java b/src/main/java/com/gaotao/modules/contract/entity/ContractEntity.java
index 68a021e..e6faf29 100644
--- a/src/main/java/com/gaotao/modules/contract/entity/ContractEntity.java
+++ b/src/main/java/com/gaotao/modules/contract/entity/ContractEntity.java
@@ -120,4 +120,10 @@ public class ContractEntity extends QueryPage implements Serializable {
 
     @TableField(exist = false)
     private String archiveDateEnd;
+
+    @TableField(exist = false)
+    private String sidx;
+
+    @TableField(exist = false)
+    private String order;
 }
diff --git a/src/main/resources/mapper/contract/ContractMapper.xml b/src/main/resources/mapper/contract/ContractMapper.xml
index 3f44c8b..e1ca685 100644
--- a/src/main/resources/mapper/contract/ContractMapper.xml
+++ b/src/main/resources/mapper/contract/ContractMapper.xml
@@ -43,8 +43,18 @@
             <if test="query.archiveDateEnd != null and query.archiveDateEnd != ''">
                 AND pc.archive_date &lt; DATEADD(day, 1, #{query.archiveDateEnd})
             </if>
+            <if test="query.whetherArchive != null and query.whetherArchive != ''">
+                AND ISNULL(pc.whether_archive, 'N') = #{query.whetherArchive}
+            </if>
         </where>
-        ORDER BY pc.id DESC
+        ORDER BY
+        <choose>
+            <when test="query.sidx == 'contractNo' and query.order == 'asc'">pc.contract_no ASC, pc.id DESC</when>
+            <when test="query.sidx == 'contractNo' and query.order == 'desc'">pc.contract_no DESC, pc.id DESC</when>
+            <when test="query.sidx == 'contractDate' and query.order == 'asc'">pc.contract_date ASC, pc.id DESC</when>
+            <when test="query.sidx == 'contractDate' and query.order == 'desc'">pc.contract_date DESC, pc.id DESC</when>
+            <otherwise>pc.id DESC</otherwise>
+        </choose>
     </select>
 
 </mapper>