From 676418446cf4419ecb50a4ea48f270b50ff2c7cd Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Fri, 9 Jan 2026 16:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8F=E9=99=A2=E6=9D=A1=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czlis/interfaceCommon/utils/LisUtil.java  |  9 +++++++
 .../zycx/service/impl/ZycxServiceImpl.java    | 27 +++++++++++++++----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisUtil.java
index 72cf087..077945d 100644
--- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisUtil.java
+++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisUtil.java
@@ -522,4 +522,13 @@ public class LisUtil {
         // 检查目标字符串是否大于等于start且小于等于end
         return target.compareTo(start) >= 0 && target.compareTo(end) <= 0;
     }
+
+    public static String isBank(Object param){
+        String s = String.valueOf(param);
+        if(s.equals("null")){
+            return "";
+        }else{
+            return s;
+        }
+    }
 }
diff --git a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
index da35807..03f61a8 100644
--- a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
+++ b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
@@ -11,6 +11,7 @@ import com.czlis.interfaceCommon.pojo.inter.GetReqInterface;
 import com.czlis.interfaceCommon.pojo.inter.SetReqStatus;
 import com.czlis.interfaceCommon.utils.CommonUtil;
 import com.czlis.interfaceCommon.utils.LisInterfaceUtil;
+import com.czlis.interfaceCommon.utils.LisUtil;
 import com.czlis.interfaceCommon.utils.ReportUtil;
 import com.czlis.zycx.mapper.ZycxMapper;
 import com.czlis.zycx.pojo.QuerySqdVO;
@@ -21,10 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Slf4j
 @Service
@@ -54,7 +52,26 @@ public class ZycxServiceImpl implements ZycxService {
         webGetBarcode.setQueryType(querySqdVO.getQueryType());
         webGetBarcode.setQueryValue(querySqdVO.getQueryValue());
         webGetBarcode.setZt(querySqdVO.getZt());
-        return zycxMapper.getSQDInfo(webGetBarcode);
+        List<Web_getBarcode> sqdInfoList = zycxMapper.getSQDInfo(webGetBarcode);
+        //排序
+        sqdInfoList.sort(new Comparator<Web_getBarcode>() {
+            @Override
+            public int compare(Web_getBarcode o1, Web_getBarcode o2) {
+                String ch1 = LisUtil.isBank(o1.getCh()).trim();
+                String ch2 = LisUtil.isBank(o2.getCh()).trim();
+                int i = ch1.compareTo(ch2);
+                if(i == 0){
+                    Date sqsj1 = o1.getSqsj();
+                    Date sqsj2 = o2.getSqsj();
+                    int i1 = sqsj1.compareTo(sqsj2);
+                   return i1;
+                }else{
+                    return i;
+                }
+            }
+        });
+
+        return sqdInfoList;
     }
 
     @Override