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 @@
AND pc.archive_date < DATEADD(day, 1, #{query.archiveDateEnd})
+
+ AND ISNULL(pc.whether_archive, 'N') = #{query.whetherArchive}
+
- ORDER BY pc.id DESC
+ ORDER BY
+
+ pc.contract_no ASC, pc.id DESC
+ pc.contract_no DESC, pc.id DESC
+ pc.contract_date ASC, pc.id DESC
+ pc.contract_date DESC, pc.id DESC
+ pc.id DESC
+