From 56bc7e8bbbc6877c1208321a5ddbeee8356398e8 Mon Sep 17 00:00:00 2001
From: yjq <yjq@qq.com>
Date: Mon, 19 Dec 2022 11:57:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8-=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cert/collect/entity/ParamsManifestEO.java |  8 ++++
 .../mapper/xml/ParamsManifestEOMapper.xml     | 41 ++++++++++++++++++-
 .../impl/ParamsManifestEOServiceImpl.java     |  4 ++
 .../modules/ocr/helpers/ConfigManager.java    |  4 +-
 4 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
index 4c73955ec..31d36258b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
@@ -109,4 +109,12 @@ public class ParamsManifestEO implements Serializable {
     //说明
     private String explanation;
 
+    //排序字段
+    @TableField(exist = false)
+    private String orderByField;
+
+    //排序规则
+    @TableField(exist = false)
+    private String orderBy;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
index 2c220de0c..3b9d184b2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
@@ -71,7 +71,44 @@
         from params_manifest pm left join params_template pt on pm.params_template_id = pt.id
         ) tmp_tb
         <include refid="BaseQuerySql"/>
-        order by create_time desc
+        <if test="paramsManifestEO.orderByField == 'create_time'">
+            order by tmp_tb.create_time
+        </if>
+        <if test="paramsManifestEO.orderByField == 'create_by'">
+            order by tmp_tb.create_by
+        </if>
+        <if test="paramsManifestEO.orderByField == 'version'">
+            order by tmp_tb.version
+        </if>
+        <if test="paramsManifestEO.orderByField == 'finish_time'">
+            order by tmp_tb.finish_time
+        </if>
+        <if test="paramsManifestEO.orderByField == 'project_version'">
+            order by tmp_tb.project_version
+        </if>
+        <if test="paramsManifestEO.orderByField == 'params_template_name'">
+            order by tmp_tb.params_template_name
+        </if>
+        <if test="paramsManifestEO.orderByField == 'state'">
+            order by tmp_tb.state
+        </if>
+        <if test="paramsManifestEO.orderByField == 'title'">
+            order by tmp_tb.title
+        </if>
+        <if test="paramsManifestEO.orderBy == 1">
+            asc
+        </if>
+        <if test="paramsManifestEO.orderBy == 2">
+            desc
+        </if>
+        <if test="paramsManifestEO.orderByField == null or paramsManifestEO.orderByField == ''">
+            order by tmp_tb.create_time desc
+        </if>
+
+
+
+
+
     </select>
 
     <select id="pageInfoAll" resultMap="ParamsManifestEOResultMapForCopy">
@@ -192,4 +229,4 @@
                         WHERE user_id = #{userId}) a ON pm.project_id = a.id
         where pm.state = #{state}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
index 8588cedc8..992ba7d22 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
@@ -360,6 +360,10 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 
 	@Override
 	public IPage pageInfo(IPage page, ParamsManifestEO paramsManifestEO) {
+		paramsManifestEO.setOrderByField("title");
+		paramsManifestEO.setOrderBy("1");
+//		paramsManifestEO.put("orderByField","title");
+//		paramsManifestEO.put("orderBy","1");
 		IPage rows = paramsManifestEOMapper.pageInfo(page, paramsManifestEO);
 		return rows;
 	}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/helpers/ConfigManager.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/helpers/ConfigManager.java
index efddcd5fa..8ad7fafea 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/helpers/ConfigManager.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/helpers/ConfigManager.java
@@ -34,7 +34,7 @@ public class ConfigManager
     {
         try
         {
-            // get stream from the settings.properties resource and load it
+            // get  from the settings.properties resource and load it
             properties = new Properties();
             InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream("settings.properties");
             properties.load(stream);
@@ -58,4 +58,4 @@ public class ConfigManager
 
         return property == null ? "" : property;
     }
-}
\ No newline at end of file
+}