From f5032195e7e6f179d62188e508a4e4fe92ac392c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 29 Jun 2022 14:11:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5--=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsMonthlyReportManageEOController.java | 2 +- .../modules/report/entity/LawsMonthlyReportManageEO.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportManageEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportManageEOController.java index 1161aa631..697719307 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportManageEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportManageEOController.java @@ -62,7 +62,7 @@ public class LawsMonthlyReportManageEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportManageEO, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = lawsMonthlyReportManageEOService.getPageInfo(page, queryWrapper); - return Result.OK(pageList); + return Result.OK(lawsMonthlyReportManageEO.getCut(),pageList); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportManageEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportManageEO.java index 9ff1f6ae8..1509de236 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportManageEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportManageEO.java @@ -1,9 +1,11 @@ package com.jero.modules.report.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -29,6 +31,9 @@ import java.io.Serializable; public class LawsMonthlyReportManageEO implements Serializable { private static final long serialVersionUID = 1L; + @TableField(exist = false) + private java.lang.String cut; + /**主键*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") @@ -64,11 +69,13 @@ public class LawsMonthlyReportManageEO implements Serializable { private java.lang.String name; /**月报语种*/ + @Dict(dicCode ="yue4_bao4_yu3_zhong3") @Excel(name = "月报语种", width = 15) @ApiModelProperty(value = "月报语种") private java.lang.String language; /**发布状态*/ + @Dict(dicCode ="fa3_gui1_yue4_bao4_guan3_li3_-_-_fa1_bu4_zhuang4_tai4") @Excel(name = "发布状态", width = 15) @ApiModelProperty(value = "发布状态") private java.lang.String issueStatus;