参数清单收集-表头排序开发。

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")
+		if(StringUtils.isEmpty(paramsCollectManifestVO.getOrderByField())){
-				.append(", add_flag DESC")
+			sqlJoinSb.append(" ORDER BY del_flag DESC")
-				.append(", change_flag DESC")
+					.append(", add_flag DESC")
-				.append(", nio_number ASC");
+					.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(); // 查询固定列

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;
 }

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()

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()