From 572f045c6eb0a6c216ea018893b78d5640d13283 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 20 Jul 2022 15:31:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5=E5=BA=93-?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/controller/ParamsExportTemplateEOController.java | 4 ++-- .../modules/cert/report/entity/ParamsExportTemplateEO.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java index 2ec6c9f98..ae1128236 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java @@ -65,11 +65,11 @@ public class ParamsExportTemplateEOController extends JeroController page = new Page(pageNo, pageSize); IPage pageList = paramsExportTemplateEOService.page(page, queryWrapper); - List rows = pageList.getRecords(); // 处理 状态 中英文 + List rows = pageList.getRecords(); Map stateMap = ExportTemplateStateEnum.toMap(cut); rows.forEach(exportTemplateEO -> { - exportTemplateEO.setState(stateMap.get(exportTemplateEO.getState())); + exportTemplateEO.setState_dictText(stateMap.get(exportTemplateEO.getState())); }); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java index 0bdd40ab1..f60c054a5 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java @@ -82,4 +82,7 @@ public class ParamsExportTemplateEO implements Serializable { @TableField(exist = false) private String cut; + @TableField(exist = false) + private String state_dictText; + }