From 1ab1231855601511903e4c80f3c30ec55df7f2c9 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 9 Feb 2023 14:37:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86-=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 19 +++++++++++++++----
 .../collect/vo/ParamsCollectManifestVO.java   |  8 ++++++++
 .../src/components/tableCollection/index.vue  |  2 ++
 .../src/components/tableCollection/index1.vue |  2 --
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index de9787f57..a84996dc9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -637,10 +637,21 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			this.createAdvanceedSearchCondition(queryConditionVOList,sqlJoinSb);
 		}
 
-		sqlJoinSb.append(" ORDER BY del_flag DESC")
-				.append(", add_flag DESC")
-				.append(", change_flag DESC")
-				.append(", nio_number ASC");
+		if(StringUtils.isEmpty(paramsCollectManifestVO.getOrderByField())){
+			sqlJoinSb.append(" ORDER BY del_flag DESC")
+					.append(", add_flag DESC")
+					.append(", change_flag DESC")
+					.append(", nio_number ASC");
+		}else {
+			// 拼接动态排序字段
+			sqlJoinSb.append(" ORDER BY ").append(paramsCollectManifestVO.getOrderByField());
+			// 拼接排序方式
+			if(StringUtils.equals(paramsCollectManifestVO.getOrderBy(),"1")){
+				sqlJoinSb.append(" ASC");
+			}else {
+				sqlJoinSb.append(" DESC");
+			}
+		}
 
 		IPage pageInfo = paramsCollectManifestEOMapper.selectpage(page, sqlJoinSb.toString(),paramsManifestEO); // 查询固定列
 		List<ParamsCollectManifestEO> list = pageInfo.getRecords(); // 查询固定列
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
index efe0bcf91..4428fb8a9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/vo/ParamsCollectManifestVO.java
@@ -1,5 +1,6 @@
 package com.jero.modules.cert.collect.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 import io.swagger.annotations.ApiModelProperty;
@@ -98,4 +99,11 @@ public class ParamsCollectManifestVO {
     // 高级查询参数
     private String queryConditionVOListStr;
 
+    //排序字段
+    @TableField(exist = false)
+    private String orderByField;
+
+    //排序规则 ”1“ 顺序  ”2“逆序
+    @TableField(exist = false)
+    private String orderBy;
 }
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index d66ccf7f5..1f375f00b 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -918,6 +918,8 @@
           sorter.columnKey = 'nio_number'
         }else if (sorter.columnKey == 'dutyTerritory'){
           sorter.columnKey = 'duty_territory'
+        }else if (sorter.columnKey == 'reportTime'){
+          sorter.columnKey = 'report_time'
         }
         this.orderByField = sorter.columnKey
         this.getTableList()
diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue
index 9077b4f35..cbc5521b4 100644
--- a/jero-web/src/components/tableCollection/index1.vue
+++ b/jero-web/src/components/tableCollection/index1.vue
@@ -639,8 +639,6 @@
         this.orderBy = sorter.order == 'ascend' ? '1' : '2'
         if(sorter.columnKey == 'nioNumber'){
           sorter.columnKey = 'nio_number'
-        } else if (sorter.columnKey == 'reportTime'){
-          sorter.columnKey = 'report_time'
         }
         this.orderByField = sorter.columnKey
         this.getTableList()