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