From 58e4e55a610cf21518b6ca08d171aeb2784e37bc Mon Sep 17 00:00:00 2001
From: guoqibing <guoqibing@sino-assistance.com>
Date: Mon, 25 May 2026 14:14:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=8E=AF=E5=A2=83=E4=BB=A5=E5=8F=8A=E5=88=B0=E6=9C=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sa/zentao/dao/ZtComputerSourceDTO.java    | 10 ++++++++++
 .../java/com/sa/zentao/entity/ZtComputerSource.java    | 10 ++++++++++
 src/main/java/com/sa/zentao/qo/ZtComputerSourceQo.java | 10 ++++++++++
 src/main/resources/mapper/ZtComputerSourceMapper.xml   |  7 ++++++-
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sa/zentao/dao/ZtComputerSourceDTO.java b/src/main/java/com/sa/zentao/dao/ZtComputerSourceDTO.java
index 8bd06ae..b535278 100644
--- a/src/main/java/com/sa/zentao/dao/ZtComputerSourceDTO.java
+++ b/src/main/java/com/sa/zentao/dao/ZtComputerSourceDTO.java
@@ -103,4 +103,14 @@ public class ZtComputerSourceDTO implements Serializable {
     private String code;
 
     private String ip;
+
+    /**
+     * 使用环境：生产环境/备用环境/开发环境/测试环境/UAT环境/办公环境
+     */
+    private String useEnv;
+
+    /**
+     * 到期时间
+     */
+    private Date expireDate;
 }
diff --git a/src/main/java/com/sa/zentao/entity/ZtComputerSource.java b/src/main/java/com/sa/zentao/entity/ZtComputerSource.java
index b98041b..55a5671 100644
--- a/src/main/java/com/sa/zentao/entity/ZtComputerSource.java
+++ b/src/main/java/com/sa/zentao/entity/ZtComputerSource.java
@@ -104,4 +104,14 @@ public class ZtComputerSource implements Serializable {
     private String code;
 
     private String ip;
+
+    /**
+     * 使用环境：生产环境/备用环境/开发环境/测试环境/UAT环境/办公环境
+     */
+    private String useEnv;
+
+    /**
+     * 到期时间
+     */
+    private Date expireDate;
 }
diff --git a/src/main/java/com/sa/zentao/qo/ZtComputerSourceQo.java b/src/main/java/com/sa/zentao/qo/ZtComputerSourceQo.java
index 3c89566..c530860 100644
--- a/src/main/java/com/sa/zentao/qo/ZtComputerSourceQo.java
+++ b/src/main/java/com/sa/zentao/qo/ZtComputerSourceQo.java
@@ -104,4 +104,14 @@ public class ZtComputerSourceQo extends BaseQo  {
 
     private String ip;
 
+    /**
+     * 使用环境：生产环境/备用环境/开发环境/测试环境/UAT环境/办公环境
+     */
+    private String useEnv;
+
+    /**
+     * 到期时间
+     */
+    private Date expireDate;
+
 }
diff --git a/src/main/resources/mapper/ZtComputerSourceMapper.xml b/src/main/resources/mapper/ZtComputerSourceMapper.xml
index 554f349..2a20b45 100644
--- a/src/main/resources/mapper/ZtComputerSourceMapper.xml
+++ b/src/main/resources/mapper/ZtComputerSourceMapper.xml
@@ -60,7 +60,12 @@
         <if test="  qo.house != null and qo.house != ''">
             and house = #{qo.house}
         </if>
-        order by id desc
+        <if test="qo.useEnv != null and qo.useEnv != ''">
+            and use_env = #{qo.useEnv}
+        </if>
+        order by
+            CASE WHEN expire_date IS NOT NULL AND expire_date <![CDATA[<]]> NOW() THEN 0 ELSE 1 END ASC,
+            id desc
     </select>
 
 </mapper>