From 1ccb5b66632176f26398b1c7e5a158a4c0ab9c55 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 27 Dec 2022 15:51:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=AF=BC=E5=87=BA=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E7=AE=A1=E7=90=86--=E8=A1=A8=E5=A4=B4=E9=80=82?= =?UTF-8?q?=E7=94=A8=E5=9C=B0=E5=8C=BA=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ParamsExportTemplateEOController.java | 8 ++++---- .../cert/report/entity/ParamsExportTemplateEO.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java index 6cdfcd34e..8a569854c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java @@ -125,19 +125,19 @@ public class ParamsExportTemplateEOController extends JeroController e.getItemValue().equals(s)).map(f -> f.getItemText()).collect(Collectors.joining(",")); regionBuilder.append(regionName).append(","); } - paramsExportTemplateEOTemp.setRegionName(regionBuilder.substring(0, regionBuilder.toString().length() - 1)); + paramsExportTemplateEOTemp.setRegion_dictText(regionBuilder.substring(0, regionBuilder.toString().length() - 1)); }else{ - paramsExportTemplateEOTemp.setRegionName(""); + paramsExportTemplateEOTemp.setRegion_dictText(""); } } Collator comparator = Collator.getInstance(Locale.CHINESE); if (OrderEnum.POSITIVE.getValue().equals(paramsExportTemplateEO.getOrderBy())) { Collections.sort(list, (e1, e2) -> { - return comparator.compare(e1.getRegionName(), e2.getRegionName()); + return comparator.compare(e1.getRegion_dictText(), e2.getRegion_dictText()); }); } else if (OrderEnum.REVERSE.getValue().equals(paramsExportTemplateEO.getOrderBy())) { Collections.sort(list, (e1, e2) -> { - return comparator.compare(e2.getRegionName(), e1.getRegionName()); + return comparator.compare(e2.getRegion_dictText(), e1.getRegion_dictText()); }); } pageList = getPages(pageNo, pageSize, list); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java index 37e482426..f78516765 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java @@ -94,6 +94,6 @@ public class ParamsExportTemplateEO implements Serializable { //适用地区 private String region; @TableField(exist = false) - private String regionName; + private String region_dictText; }