From 9a141a38997286a40a53191722d16060230f1d7e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Sun, 25 Sep 2022 10:02:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6--=E6=8C=89?=
 =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E6=AD=A3=E5=BA=8F=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 569e7bd31..e53b0e1b1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -3806,17 +3806,26 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 }
             }
         }
-
-        //处理列表表头排序
-        if (StringUtils.isNotBlank((String) parameter.get("orderByField"))) {
-            conditionSb.append(" order by " + (String) parameter.get("orderByField"));
-            if ("1".equals((String) parameter.get("orderBy"))) {
-                conditionSb.append(" asc");//正序
-            } else if ("2".equals((String) parameter.get("orderBy"))) {
-                conditionSb.append(" desc");//倒序
+        //法规预警的排序与其他不同单独处理
+        if(StringUtils.isNotBlank(warnTime)){
+            //flag = 0(新车实施日期), flag = 1(在产车实施日期)
+            if("0".equals(flag)){
+                conditionSb.append(" order by xin1_che1_xing2_shi2_shi1_ri4_qi1 asc");
+            }else{
+                conditionSb.append(" order by implement_time asc");
+            }
+        }else{
+            //处理列表表头排序
+            if (StringUtils.isNotBlank((String) parameter.get("orderByField"))) {
+                conditionSb.append(" order by " + (String) parameter.get("orderByField"));
+                if ("1".equals((String) parameter.get("orderBy"))) {
+                    conditionSb.append(" asc");//正序
+                } else if ("2".equals((String) parameter.get("orderBy"))) {
+                    conditionSb.append(" desc");//倒序
+                }
+            } else {
+                conditionSb.append(" order by create_time desc");
             }
-        } else {
-            conditionSb.append(" order by create_time desc");
         }
         String condition = conditionSb.toString();
         return condition;