From 22ec22df3fb6a86cbe722b5efdbbf0b4608012a8 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 7 Mar 2022 16:06:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?= 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 | 4 +- .../tag/mapper/OnlCgformTagMapper.java | 10 +- .../tag/service/IOnlCgformTagService.java | 19 +-- .../service/impl/OnlCgformTagServiceImpl.java | 117 ++---------------- 5 files changed, 25 insertions(+), 152 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 6e57573b3..546f9c4ea 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 @@ -85,33 +85,6 @@ public class OnlCgformTagController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, - @RequestParam(name = "cut") String cut) { - List> list =onlCgformTagService.getHeader(flag,cut); - return Result.OK(list); - }*/ - - /** - * 查询条件中英文切换 - * - * @return - */ - /*@AutoLog(value = "标签管理-查询条件中英文切换") - @ApiOperation(value="标签管理-查询条件中英文切换", notes="标签管理-查询条件中英文切换") - @GetMapping(value = "/queryCondition") - public Result>> queryCondition(@RequestParam(name = "flag") String flag, - @RequestParam(name = "cut") String cut) { - List> list = onlCgformTagService.queryCondition(flag,cut); - return Result.OK(list); - }*/ /** * 列表查询 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 0f5a75581..61a8e4b6f 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 @@ -148,8 +148,8 @@ public class OnlCgformTag implements Serializable { private java.lang.Integer isReadOnly; /**展示区域id*/ - @Excel(name = "展示区域id", width = 15, dictTable = "onl_cgform_area", dicText = "area_id", dicCode = "id") - @Dict(dictTable = "onl_cgform_area", dicText = "area_id", dicCode = "id") + @Excel(name = "展示区域id", width = 15, dictTable = "onl_cgform_area", dicText = "show_area", dicCode = "id") + @Dict(dictTable = "onl_cgform_area", dicText = "show_area", dicCode = "id") @ApiModelProperty(value = "展示区域id") private java.lang.String showArea; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java index a3951c43c..9a45174fd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java @@ -19,15 +19,15 @@ public interface OnlCgformTagMapper extends BaseMapper { "f.is_model,f.db_field_txt,f.db_field_en_name,\n" + "f.field_show_type,i.item_text,f.dict_id,f.db_length,\n" + "f.order_num,f.field_must_input,f.is_show_form,f.is_show_list,\n" + - "f.is_read_only,f.show_area as area_id,a.show_area,f.is_query,f.is_show_laws_list,f.is_show_search,f.is_delete,\n" + + "f.is_read_only,f.show_area,a.show_area as show_area_name,f.is_query,f.is_show_laws_list,f.is_show_search,f.is_delete,\n" + "f.db_field_name,f.db_is_key,f.db_is_null,f.db_point_length,f.db_type,\n" + "i.en_name as field_show_type_en_name,a.en_name as show_area_en_name\n" + "from onl_cgform_field as f \n" + "left join sys_dict_item as i on f.field_show_type=i.item_value\n" + "left join onl_cgform_area as a on f.show_area=a.id\n" + - "order by f.create_time desc\n" + - "where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\" \n" + - "and i.dict_id=1493098515761917954 order by f.create_time desc\n") - IPage queryPageList(IPage page,@Param("params") Map params); + "where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\"\n" + + "and i.dict_id=1493098515761917954 \n" + + "order by f.create_time desc ") + IPage queryPageList(IPage page,@Param("params") Map params); //IPage> selectPageInfo(Page page, Wrapper queryWrapper); } 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 f965c1bc2..13faca89e 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 @@ -73,22 +73,13 @@ public interface IOnlCgformTagService extends IService { */ Integer queryExitData(OnlCgformTag onlCgformTag) ; + /** + * 若区域下有标签字段 则无法删除 + * + * @return + */ Integer queryExitArea(OnlCgformArea onlCgformArea); - /** - * 列表表头中英文切换 - * @param cut - * @return - */ - //List> getHeader(String flag, String cut); - - /** - * 查询条件中英文切换 - * @param - * @return - */ - //List> queryCondition(String flag,String cut); - //List> selectPageInfo(Page page, Wrapper queryWrapper); } 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 dc014eb5c..67539af06 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 @@ -1,6 +1,7 @@ package com.jero.modules.tag.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -96,10 +97,10 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryPageList(Map params) { + public IPage queryPageList(Map params) { Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); - IPage page = new Page(pageNo, pageSize); + IPage page = new Page(pageNo, pageSize); //中英切换-属性类型+展示区域列 if (CutEnum.CN.getValue().equals(params.get("cut").toString())) { @@ -149,114 +150,22 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); if (StringUtils.isNotBlank(onlCgformArea.getShowArea())) { - queryWrapper.eq(OnlCgformTag::getShowArea,onlCgformArea.getId()); + queryWrapper.select("show_area").eq("show_area",onlCgformArea.getId()); } Integer count = onlCgformTagMapper.selectCount(queryWrapper); return count; - } - /** - * 列表表头中英文切换 - * - * @return - */ - /*@Override - public List> getHeader(String flag, String cut) { - List> list = new ArrayList<>(); - Map map1 = new HashMap<>(); - Map map2 = new HashMap<>(); - Map map3 = new HashMap<>(); - Map map4 = new HashMap<>(); - Map map5 = new HashMap<>(); - Map map6 = new HashMap<>(); - if (ModuleEnum.ONL_CGFORM_TAG.getValue().equals(flag)) { - System.out.println("走的flag=3"); - if (CutEnum.CN.getValue().equals(cut)) { - System.out.println("走的cut=cn"); - //中文名称 - map1.put("db_field_name", "db_field_txt");//字段 - map1.put("db_field_txt", "中文名称");//字段中文名 - list.add(map1); - //英文名称 - map2.put("db_field_name", "db_field_en_name");//字段 - map2.put("db_field_txt", "英文名称");//字段中文名 - list.add(map2); - //属性类型 - map3.put("db_field_name", "field_show_type");//字段 - map3.put("db_field_txt", "属性类型");//字段中文名 - list.add(map3); - //字段长度 - map4.put("db_field_name", "db_length");//字段 - map4.put("db_field_txt", "字段长度");//字段中文名 - list.add(map4); - //展示顺序 - map5.put("db_field_name", "order_num");//字段 - map5.put("db_field_txt", "展示顺序");//字段中文名 - list.add(map5); - //展示区域 - map6.put("db_field_name", "show_area");//字段 - map6.put("db_field_txt", "展示区域");//字段中文名 - list.add(map6); - } else { - System.out.println("走的cut=en"); - //中文名称 - map1.put("db_field_name", "db_field_txt");//字段 - map1.put("db_field_txt", "chinese name");//字段英文名 - list.add(map1); - //英文名称 - map2.put("db_field_name", "db_field_en_name");//字段 - map2.put("db_field_txt", "english name");//字段英文名 - list.add(map2); - //属性类型 - map3.put("db_field_name", "field_show_type");//字段 - map3.put("db_field_txt", "attribute type");//字段英文名 - list.add(map3); - //字段长度 - map4.put("db_field_name", "db_length");//字段 - map4.put("db_field_txt", "field length");//字段英文名 - list.add(map4); - //展示顺序 - map5.put("db_field_name", "order_num");//字段 - map5.put("db_field_txt", "display order");//字段英文名 - list.add(map5); - //展示区域 - map6.put("db_field_name", "show_area");//字段 - map6.put("db_field_txt", "display area");//字段英文名 - list.add(map6); - } - } - return list; - } -*/ - /** - * 查询条件中英文切换 - * - * @return - */ - /*@Override - public List> queryCondition(String flag, String cut) { - List> list = new ArrayList<>(); - Map map1 = new HashMap<>(); - Map map2 = new HashMap<>(); - if (CutEnum.CN.getValue().equals(cut)) { - // map2= (Map) onlCgformAreaService.queryShowArea(cut,onlCgformArea); - map1.put("db_field_name", "show_area");//字段 - map1.put("db_field_txt", "展示区域");//字段中文名 - map1.put("value", String.valueOf(map2)); - map1.put("field_show_type", "1"); - list.add(map1); - } else { - //map2= (Map) onlCgformAreaService.queryShowArea(cut,onlCgformArea); - map1.put("db_field_name", "show_area");//字段 - map1.put("db_field_txt", "display area");//字段英文名 - map1.put("value", String.valueOf(map2)); - map1.put("field_show_type", "1"); - list.add(map1); + + + /*LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotBlank(onlCgformArea.getShowArea())) { + queryWrapper.select("show_area",).eq(OnlCgformTag::getShowArea,onlCgformArea.getId()); } - return list; - }*/ + Integer count = onlCgformTagMapper.selectCount(queryWrapper); + return count;*/ + } /* @Override public List> selectPageInfo(Page page, Wrapper queryWrapper) {