diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java index c3722c5b2..f9d190611 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java @@ -160,6 +160,6 @@ public interface SysDictMapper extends BaseMapper { "i.item_text as attribute_type_name,i.en_name as attribute_type_en_name\n" + "from sys_dict as d\n" + "left join sys_dict_item as i on d.attribute_type=i.item_value\n" + - "where i.dict_id=\"1494570247913512962\"") - IPage queryPageList(IPage page,@Param("params") Map params); + "where i.dict_id=\"1494570247913512962\" and d.del_flag=0") + IPage queryPageList(IPage page,@Param("params") Map params); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index edc05cd09..3ae2e61e9 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -402,15 +402,19 @@ public class SysDictServiceImpl extends ServiceImpl impl */ @Override public IPage queryPageList(Map params) { - Integer pageNo= Integer.valueOf(params.get("pageNo").toString()); - Integer pageSize= Integer.valueOf(params.get("pageSize").toString()); - IPage page=new Page(pageNo,pageSize); - //中英切换-属性类型列 - if(CutEnum.EN.getValue().equals(params.get("cut").toString())){ - params.put("attributeTypeName",params.get("attributeTypeEnName")); + Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); + Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); + IPage page = new Page(pageNo, pageSize); + IPage result = sysDictMapper.queryPageList(page, params); + List records = result.getRecords(); + String cut = (String) params.get("cut"); + //中英切换-字典名称+属性类型列 + if(CutEnum.EN.getValue().equals(cut)){ + for(SysDict data:records){ + data.setDictName(data.getDictEnName()); + data.setAttributeTypeName(data.getAttributeTypeEnName()); + } } - IPage result=sysDictMapper.queryPageList(page,params); return result; } - } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java index 358cab53d..141a21372 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java @@ -1,6 +1,7 @@ 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; @@ -75,6 +76,13 @@ public class OnlCgformArea implements Serializable { @ApiModelProperty(value = "所属模块(1文档库,0文档拆分)") private java.lang.String isModel; + /**所属模块名称*/ + @TableField(exist = false) + @Excel(name = "所属模块名称", width = 15,dictTable = "sys_dict_item", dicText = "item_text", dicCode ="item_text") + @Dict(dictTable = "sys_dict_item", dicText = "item_text", dicCode ="item_text") + @ApiModelProperty(value = "所属模块名称") + private java.lang.String isModelName; + /**排序号*/ @Excel(name = "排序号", width = 15) @ApiModelProperty(value = "排序号") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformAreaMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformAreaMapper.java index aa49f01c6..5254c5a26 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformAreaMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformAreaMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.tag.entity.OnlCgformArea; import org.apache.ibatis.annotations.Select; +import org.springframework.data.repository.query.Param; import java.util.Map; @@ -15,10 +16,15 @@ import java.util.Map; * @Version: V1.0 */ public interface OnlCgformAreaMapper extends BaseMapper { + /** + * 分页列表查询 + * + * @return + */ @Select("select a.id,a.create_by,a.create_time,a.update_by,a.update_time,\n" + - "a.is_model,i.item_text,a.show_area,a.sort,a.en_name,i.en_name as model_en_name\n" + + "a.is_model,i.item_text as is_model_name,a.show_area,a.sort,a.en_name,i.en_name as model_en_name\n" + "from onl_cgform_area as a left join sys_dict_item as i \n" + "on a.is_model=i.item_value \n" + - "where i.dict_id=1493096744092102657 order by a.create_time desc") - IPage querPageList(IPage page, Map params); + "where i.dict_id=1493096744092102657 order by a.create_time desc") + IPage queryPageList(IPage page, @Param("params") Map params); } 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 1616c72ec..83944f4ba 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 @@ -15,21 +15,11 @@ import java.util.Map; * @Version: V1.0 */ public interface OnlCgformTagMapper extends BaseMapper { - /* @Select("select f.id,f.create_by,f.create_time,f.update_by,f.update_time,f.cgform_head_id,\n" + - "f.is_model,f.db_field_txt,f.db_field_en_name,\n" + - "f.field_show_type,i.item_text as field_show_type_name,\n" + - "f.dict_id,f.db_length,f.order_num,f.field_must_input,\n" + - "f.is_show_form,f.is_show_list,f.is_read_only,\n" + - "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" + - "where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\"\n" + - "and f.is_delete=0\n" + - "and i.dict_id=1493098515761917954 \n" + - "order by f.order_num asc ")*/ + /** + * 分页列表查询 + * + * @return + */ IPage queryPageList(IPage page,@Param("params") Map params); /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml index f711e5900..feb1d2bb9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml @@ -26,7 +26,7 @@ - select f.id,f.create_by,f.create_time,f.update_by,f.update_time,f.cgform_head_id, f.is_model,f.db_field_txt,f.db_field_en_name, f.field_show_type,i.item_text as field_show_type_name, @@ -41,10 +41,18 @@ where f.cgform_head_id="48308196e7b04761b533dc31bc899707" and f.is_delete=0 and i.dict_id=1493098515761917954 - - - and f.db_field_txt like concat('%',#{params.dbFieldTxt},'%') + + + and f.db_field_txt like concat('%',#{params.dbFieldTxt},'%') + + + + + and f.db_field_en_name like concat('%',#{params.dbFieldTxt},'%') + + + and f.show_area like concat('%',#{params.showArea},'%') diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java index 7d078267c..57bcf8c62 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java @@ -77,7 +77,10 @@ public interface IOnlCgformAreaService extends IService { */ List selectShowAreaById(String id); - //List> selectPageInfo(Page page, Wrapper queryWrapper); - + /** + * 分页列表查询 + * + * @return + */ IPage queryPageList(Map params); } 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 da7761c6c..f99d6abfe 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 @@ -56,7 +56,11 @@ public interface IOnlCgformTagService extends IService { */ OnlCgformTag queryById(String id); - + /** + * 分页列表查询 + * + * @return + */ IPage queryPageList(Map params); /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java index 8004f3d89..78805f97e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java @@ -34,6 +34,7 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryList(OnlCgformArea onlCgformArea) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(onlCgformArea.getIsModel())){ - lambdaQueryWrapper.eq(OnlCgformArea::getIsModel,onlCgformArea.getIsModel()); + if (StringUtils.isNotBlank(onlCgformArea.getIsModel())) { + lambdaQueryWrapper.eq(OnlCgformArea::getIsModel, onlCgformArea.getIsModel()); } lambdaQueryWrapper.orderByAsc(OnlCgformArea::getSort); return list(lambdaQueryWrapper); @@ -118,12 +119,12 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryShowArea(String cut, OnlCgformArea onlCgformArea) { QueryWrapper queryWrapper = new QueryWrapper<>(); if (CutEnum.CN.getValue().equals(cut)) { - queryWrapper.select("id","show_area").orderByAsc("sort"); + queryWrapper.select("id", "show_area").orderByAsc("sort"); return list(queryWrapper); - }else{ - queryWrapper.select("id","en_name").orderByAsc("sort"); + } else { + queryWrapper.select("id", "en_name").orderByAsc("sort"); List resetlist = list(queryWrapper); - resetlist.stream().forEach(f->f.setShowArea(f.getEnName())); + resetlist.stream().forEach(f -> f.setShowArea(f.getEnName())); return resetlist; } } @@ -134,21 +135,24 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl selectShowAreaById(String id) { - QueryWrapper list=new QueryWrapper().select(id,"showArea"); + QueryWrapper list = new QueryWrapper().select(id, "showArea"); return list(list); } @Override 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); - - //中英切换--所属模块 - if(CutEnum.EN.getValue().equals(params.get("cut").toString())) { - params.put("isModel", params.get("enName")); + Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); + Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); + IPage page = new Page(pageNo, pageSize); + IPage result = onlCgformAreaMapper.queryPageList(page, params); + List records = result.getRecords(); + String cut = (String) params.get("cut"); + //中英切换-所属模块 + if(CutEnum.EN.getValue().equals(cut)){ + for(OnlCgformArea data:records){ + data.setIsModelName(data.getEnName()); + } } - IPage result=onlCgformAreaMapper.querPageList(page,params); return result; } -} +} \ No newline at end of file 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 1d6fdb13f..0f53acd9c 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 @@ -14,6 +14,7 @@ import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.system.service.impl.SysDictServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; +import com.jero.modules.tag.enums.FileTableIdEnum; import com.jero.modules.tag.mapper.OnlCgformTagMapper; import com.jero.modules.tag.service.IOnlCgformTagService; import com.jero.modules.utils.HanYuPinYinUtil; @@ -60,7 +61,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl> records = result.getRecords(); - + IPage result = onlCgformTagMapper.queryPageList(page, params); + List records = result.getRecords(); String cut = (String) params.get("cut"); //中英切换-属性类型+展示区域列 if(CutEnum.EN.getValue().equals(cut)){ - for(Map data:records){ - System.out.println("这里这里fieldShowTypeEnName"+data.get("fieldShowTypeEnName")); - System.out.println("这里这里showAreaEnName"+data.get("showAreaEnName")); - data.put("fieldShowTypeName",data.get("fieldShowTypeEnName")); - data.put("showAreaName",data.get("showAreaEnName")); + for(OnlCgformTag data:records){ + data.setFieldShowTypeName(data.getDbFieldEnName()); + data.setShowAreaName(data.getShowAreaEnName()); } - } return result; }