From ab81ce9fa7b32ac4da02f7c5ccca4cc4e8ff72a3 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 17 Feb 2022 15:09:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86-=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=A1=B9-=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OnlCgformTagController.java | 27 +++++++++++++------ .../jero/modules/tag/entity/OnlCgformTag.java | 5 ++-- .../tag/service/IOnlCgformTagService.java | 14 ++++++++-- .../service/impl/OnlCgformTagServiceImpl.java | 16 ++++++++--- 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index b1a95f4a1..756c094b2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -162,20 +162,31 @@ public class OnlCgformTagController extends JeroController> queryIsModelById(@RequestParam(name="id",required=true) String id) { - QueryWrapper queryWrapper=new QueryWrapper<>(); - List list = onlCgformTagService.queryIsModelById(id); + @AutoLog(value = "标签管理-通过id查询展示区域") + @ApiOperation(value="标签管理-通过id查询展示区域", notes="标签管理-通过id查询展示区域") + @GetMapping(value = "/selectShowArealById") + public Result> selectShowAreaById(@RequestParam(name="id",required=true) String id) { + List list = onlCgformTagService.selectShowAreaById(id); + return Result.OK(list); + } + /** + * 通过id查询字典名称 + * + * @param id + * @return + */ + @AutoLog(value = "标签管理-通过id查询字典名称") + @ApiOperation(value="标签管理-通过id查询字典名称", notes="标签管理-通过id查询字典名称") + @GetMapping(value = "/selectDictNameById") + public Result> selectDictNameById(@RequestParam(name="id",required=true) String id) { + List list = onlCgformTagService.selectDictNameById(id); return Result.OK(list); } - /** * 导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java index aef33f139..e45344594 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java @@ -1,7 +1,6 @@ package com.jero.modules.tag.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; @@ -62,9 +61,9 @@ public class OnlCgformTag implements Serializable { /**所属模块(1文档库,0文档拆分)*/ @Excel(name = "所属模块(1文档库,0文档拆分)", width = 15, dictTable = "onl_cgform_area", dicText = "is_model", dicCode = "is_model") - @Dict(dictTable = "onl_cgform_area", dicText = "is_model", dicCode = "is_model") + //@Dict(dictTable = "onl_cgform_area", dicText = "is_model", dicCode = "is_model") + @Dict(dicCode = "module") @ApiModelProperty(value = "所属模块(1文档库,0文档拆分)") - @TableField("is_model") private java.lang.String isModel; /**字段备注*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java index f8333f8f4..647498d45 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java @@ -52,13 +52,23 @@ public interface IOnlCgformTagService extends IService { * @return */ OnlCgformTag queryById(String id); + /** - * 通过id查询所属模块 + * 通过id查询展示区域 * * @param id * @return */ - List queryIsModelById(String id); + List selectShowAreaById(String id); + + /** + * 通过id查询字典名称 + * + * @param id + * @return + */ + List selectDictNameById(String id); + /** * 列表查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index 792a268a9..f089469a7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -84,15 +84,23 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryIsModelById(String id) { + public List selectShowAreaById(String id) { QueryWrapper queryWrapper=new QueryWrapper<>(); - queryWrapper.select("is_model").eq("id",id); + queryWrapper.select("show_area").eq("id",id); + return list(queryWrapper); + } + /** + *根据id查展示区域 + */ + @Override + public List selectDictNameById(String id) { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.select("dict_name").eq("id",id); return list(queryWrapper); } - /** * 列表查询 *