From e0af0f4f834f3a5ad8b3f77817abc4dd8cf1f33c Mon Sep 17 00:00:00 2001 From: yjq Date: Wed, 1 Feb 2023 15:01:57 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86--=E8=A7=A3=E5=86=B3=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=93=8D=E4=BD=9C=E8=AF=A6=E6=83=85=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsReportDetailEOServiceImpl.java | 33 ++++++++++++++++++- .../impl/SarFileCompareInfoServiceImpl.java | 4 +-- 2 files changed, 34 insertions(+), 3 deletions(-) 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 15d3aac78..082dd9bbd 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 @@ -1725,7 +1725,10 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl entry : map.entrySet()) { String key = entry.getKey(); if ("id".equals(key)) { @@ -1753,8 +1756,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl paramsReportConfigDataEOList) { List configDataEOList = paramsReportConfigDataEOList.stream() .filter(e-> configId.equals(e.getParamsConfigId()) && collectManifestId.equals(e.getParamsCollectManifestId())) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index c97fca666..52e1937bc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -132,14 +132,14 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl leftMenuEOList = sarFileSplitMenuEOService.queryByInfoId(leftStandard); Map leftMenuMap = wrapperMenuMap(leftMenuEOList, sfcInfo.getId(), CompareConst.POS_LEFT); sarFileCompareMenuService.saveBatch(leftMenuMap.values()); List rightMenuEOList = sarFileSplitMenuEOService.queryByInfoId(rightStandard); Map rightMenuMap = wrapperMenuMap(rightMenuEOList, sfcInfo.getId(), CompareConst.POS_RIGHT); sarFileCompareMenuService.saveBatch(rightMenuMap.values()); - + //文档对比信息条款 List leftItemEOList = sarFileSplitItemsEOService.selectByInfoId(leftStandard); List leftItemList = wrapperItemList(leftItemEOList, sfcInfo.getId(), leftMenuMap, CompareConst.POS_LEFT); List rightItemEOList = sarFileSplitItemsEOService.selectByInfoId(rightStandard); From 9ddd197ea5c4aab7cd92f7648dce8084a1d41390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 8 Feb 2023 14:04:25 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E6=B5=81=E7=A8=8B=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= =?UTF-8?q?-=E6=88=AA=E8=87=B3=E6=97=B6=E9=97=B4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 2a462f93f..cdcfad0bc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -3173,12 +3173,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 8 Feb 2023 15:43:06 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E5=8F=91=E9=80=81=E9=A3=9E=E4=B9=A6=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=97=B6=20=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index cdcfad0bc..1b02e6e9c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -3384,9 +3384,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl @@ -840,9 +840,6 @@ } }) }, - tableOnChange(pagination, filters, sorter) { - console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii') - }, getTableListReset() { this.formInline = {} this.queryParamQuery = {} @@ -915,6 +912,11 @@ cancleoperationFailed() { this.selectedRowKeys = [] }, + tableOnChange(pagination, filters, sorter) { + this.orderBy = sorter.order == 'ascend' ? '1' : '2' + this.orderByField = sorter.columnKey + this.getTableList() + }, getTableList(currentPersonRole) { let paramsManifestid let url @@ -935,6 +937,8 @@ pageSize: this.pageSize, userTypes: this.currentPersonRole || currentPersonRole, paramsManifestId: paramsManifestid, + orderBy: this.orderBy, + orderByField: this.orderByField, ...this.formInline, ...currentPersonRole, ...this.queryParamQuery diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 709235e41..a8601e137 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -636,7 +636,9 @@ }) }, tableOnChange(pagination, filters, sorter) { - console.log(pagination, filters, sorter, 'iiiiiiiiiiiiiiiii') + this.orderBy = sorter.order == 'ascend' ? '1' : '2' + this.orderByField = sorter.columnKey + this.getTableList() }, getTableListReset() { let params = { @@ -709,6 +711,8 @@ let params = { pageNo: this.pageNo, pageSize: this.pageSize, + orderBy: this.orderBy, + orderByField: this.orderByField, userTypes: this.currentPersonRole || currentPersonRole, paramsManifestId: paramsManifestid, ...this.formInline diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 107c37879..7e62e712a 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -181,12 +181,14 @@ export default { align: 'left', dataIndex: 'dutyTerritory_dictText', width: 150, + sorter: true, ellipsis: true, }, { title: this.$t('created'), align: 'left', dataIndex: 'createTime', + sorter: true, width: 180, ellipsis: true, }, @@ -210,8 +212,11 @@ export default { }, handleTableChange(pagination, filters, sorter) { let _i = sorter.order === 'descend' ? 'asc': 'desc' + if(sorter.columnKey == 'dutyTerritory_dictText'){ + sorter.columnKey = 'dutyTerritory' + } let _tt = { - orderByField: 'nioNumber', + orderByField: sorter.columnKey, orderBy: _i } this.queryParam = { From abd8f44d262ec5f45745749a3097bd4d052d9a66 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 9 Feb 2023 11:26:38 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E8=BF=94=E5=9B=9E=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=A0=87=E8=AF=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 b0365d022..707a89e12 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 @@ -1413,6 +1413,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Thu, 9 Feb 2023 13:51:16 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/parameter/parameterlist/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 7e62e712a..f85de803b 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -213,7 +213,7 @@ export default { handleTableChange(pagination, filters, sorter) { let _i = sorter.order === 'descend' ? 'asc': 'desc' if(sorter.columnKey == 'dutyTerritory_dictText'){ - sorter.columnKey = 'dutyTerritory' + sorter.columnKey = 'duty_territory' } let _tt = { orderByField: sorter.columnKey, From 6249a2d20e277eea05522bbe0579cddc0f0c9fb2 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 9 Feb 2023 14:13:35 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=20=E6=8E=92=E5=BA=8F=E4=BC=A0?= =?UTF-8?q?=E5=8F=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 3 +++ jero-web/src/components/tableCollection/index1.vue | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 6ab33f434..43377f381 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -914,6 +914,9 @@ }, tableOnChange(pagination, filters, sorter) { this.orderBy = sorter.order == 'ascend' ? '1' : '2' + if(sorter.columnKey == 'nioNumber'){ + sorter.columnKey = 'nio_number' + } 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 a8601e137..9077b4f35 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -637,6 +637,11 @@ }, tableOnChange(pagination, filters, sorter) { 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() }, From 2a8f2416583b133043a00aae2927cce020f2dc9d Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 9 Feb 2023 14:17:09 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 43377f381..d66ccf7f5 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -916,6 +916,8 @@ this.orderBy = sorter.order == 'ascend' ? '1' : '2' if(sorter.columnKey == 'nioNumber'){ sorter.columnKey = 'nio_number' + }else if (sorter.columnKey == 'dutyTerritory'){ + sorter.columnKey = 'duty_territory' } this.orderByField = sorter.columnKey this.getTableList() From 1debc8c196c35db2d8181de252a0707dc5106097 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 9 Feb 2023 14:27:37 +0800 Subject: [PATCH 10/14] update --- .../collect/service/impl/ParamsCollectManifestEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 707a89e12..de9787f57 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 @@ -1418,6 +1418,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Thu, 9 Feb 2023 14:37:33 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=BC=80=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 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() From b3f23bc0db9e34b687e88013cc74b40930088146 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 9 Feb 2023 16:42:03 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93-=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E6=95=B0=E6=8D=AE=E8=A1=A8=E5=A4=B4=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=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 - order by sync_time desc, nio_number asc + + ${paramsReportDetailVO.orderBySql} + + + order by sync_time desc, nio_number asc + - select d.depart_name,ud.user_id from sys_user_depart ud,sys_depart d where d.id = ud.dep_id and ud.user_id in + select distinct d.depart_name,ud.user_id from sys_user_depart ud,sys_depart d where d.id = ud.dep_id and ud.user_id in #{id}