From b3f23bc0db9e34b687e88013cc74b40930088146 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 9 Feb 2023 16:42:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93-=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ParamsReportDetailEOMapper.xml |  7 ++++++-
 .../impl/ParamsReportDetailEOServiceImpl.java | 21 +++++++++++++++++++
 .../cert/report/vo/ParamsReportDetailVO.java  | 12 +++++++++++
 .../src/components/tableCollection/index1.vue |  2 ++
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index cadd19977..3fba744b4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -145,7 +145,12 @@
         select prd.*
         from params_report_detail prd
         <include refid="BaseQuerySql2"/>
-        order by sync_time desc, nio_number asc
+        <if test="paramsReportDetailVO.orderBySql != null">
+            ${paramsReportDetailVO.orderBySql}
+        </if>
+        <if test="paramsReportDetailVO.orderBySql == null">
+            order by sync_time desc, nio_number asc
+        </if>
     </select>
 
     <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 082dd9bbd..b196352b8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -125,6 +125,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 	public IPage queryList(IPage page, ParamsReportDetailVO paramsReportDetailVO, String cut) {
 		String paramsManifestId = paramsReportDetailVO.getParamsManifestId();
 
+		// 如果排序字段不为空
+		if(StringUtils.isNotEmpty(paramsReportDetailVO.getOrderByField())){`
+			StringBuilder sqlSb = new StringBuilder();
+			sqlSb.append(" ORDER BY ").append(paramsReportDetailVO.getOrderByField());
+			if(StringUtils.equals(paramsReportDetailVO.getOrderBy(),"1")){
+				sqlSb.append(" ASC");
+			}else {
+				sqlSb.append(" DESC");
+			}
+			paramsReportDetailVO.setOrderBySql(sqlSb.toString());
+		}
+
 		IPage pageInfo = paramsReportDetailEOMapper.pageInfo(page, paramsReportDetailVO); // 查询固定列
 		List<ParamsReportDetailEO> list = pageInfo.getRecords(); // 查询固定列
 		List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列
@@ -586,6 +598,15 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				map.put("orderNum",orderNumStart);
 				orderNumStart ++;
 			}
+
+			if(StringUtils.equals(dbFieldName,"nio_number")
+					||StringUtils.equals(dbFieldName,"sdt")
+					||StringUtils.equals(dbFieldName,"dre")
+					||StringUtils.equals(dbFieldName,"sync_time")
+			){
+				map.put("sort","true");
+			}
+
 			list.add(map);
 		}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
index 9a90907b7..766c7fa43 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
@@ -1,5 +1,6 @@
 package com.jero.modules.cert.report.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -60,4 +61,15 @@ public class ParamsReportDetailVO {
 
     private String allNumber;
 
+
+    //排序字段
+    @TableField(exist = false)
+    private String orderByField;
+
+    //排序规则 ”1“ 顺序  ”2“逆序
+    @TableField(exist = false)
+    private String orderBy;
+
+    @TableField(exist = false)
+    private String orderBySql;
 }
diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue
index cbc5521b4..d2aacffee 100644
--- a/jero-web/src/components/tableCollection/index1.vue
+++ b/jero-web/src/components/tableCollection/index1.vue
@@ -639,6 +639,8 @@
         this.orderBy = sorter.order == 'ascend' ? '1' : '2'
         if(sorter.columnKey == 'nioNumber'){
           sorter.columnKey = 'nio_number'
+        }else if (sorter.columnKey == 'syncTime'){
+          sorter.columnKey = 'sync_time'
         }
         this.orderByField = sorter.columnKey
         this.getTableList()