WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
xiejunyu
2022-03-16 14:20:16 +08:00
parent eaa219a460
commit 4ea700f4fe
10 changed files with 85 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java
+2 -2
View File
@@ -160,6 +160,6 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
"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<SysDict> queryPageList(IPage page,@Param("params") Map<String,Object> params);
"where i.dict_id=\"1494570247913512962\" and d.del_flag=0")
IPage queryPageList(IPage page,@Param("params") Map<String,Object> params);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+12 -8
View File
@@ -402,15 +402,19 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
*/
@Override
public IPage<SysDict> queryPageList(Map<String, Object> params) {
Integer pageNo= Integer.valueOf(params.get("pageNo").toString());
Integer pageSize= Integer.valueOf(params.get("pageSize").toString());
IPage<SysDict> 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<SysDict> result = sysDictMapper.queryPageList(page, params);
List<SysDict> 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<SysDict> result=sysDictMapper.queryPageList(page,params);
return result;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java
+8
View File
@@ -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 = "排序号")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformAreaMapper.java
+9 -3
View File
@@ -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<OnlCgformArea> {
/**
* 分页列表查询
*
* @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<OnlCgformArea> querPageList(IPage<OnlCgformArea> page, Map<String, Object> params);
"where i.dict_id=1493096744092102657 order by a.create_time desc")
IPage<OnlCgformArea> queryPageList(IPage page, @Param("params") Map<String,Object> params);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java
+5 -15
View File
@@ -15,21 +15,11 @@ import java.util.Map;
* @Version: V1.0
*/
public interface OnlCgformTagMapper extends BaseMapper<OnlCgformTag> {
/* @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<OnlCgformTag> queryPageList(IPage page,@Param("params") Map<String,Object> params);
/**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml
+12 -4
View File
@@ -26,7 +26,7 @@
<result column="is_show_search" property="isShowSearch" />
<result column="is_delete" property="isDelete" />
</resultMap>
<select id="queryPageList" resultType="hashmap">
<select id="queryPageList" resultType="com.jero.modules.tag.entity.OnlCgformTag">
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
<if test="params.dbFieldTxt != null and params.dbFieldTxt != '' ">
and f.db_field_txt like concat('%',#{params.dbFieldTxt},'%')
<if test="params.cut='cn'">
<if test="params.dbFieldTxt != null and params.dbFieldTxt != ''">
and f.db_field_txt like concat('%',#{params.dbFieldTxt},'%')
</if>
</if>
<if test="params.cut='en'">
<if test="params.dbFieldTxt != null and params.dbFieldTxt != ''">
and f.db_field_en_name like concat('%',#{params.dbFieldTxt},'%')
</if>
</if>
<if test="params.showArea != null and params.showArea != '' ">
and f.show_area like concat('%',#{params.showArea},'%')
</if>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java
+5 -2
View File
@@ -77,7 +77,10 @@ public interface IOnlCgformAreaService extends IService<OnlCgformArea> {
*/
List<OnlCgformArea> selectShowAreaById(String id);
//List<Map<String, Object>> selectPageInfo(Page page, Wrapper<OnlCgformArea> queryWrapper);
/**
* 分页列表查询
*
* @return
*/
IPage<OnlCgformArea> queryPageList(Map<String, Object> params);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java
+5 -1
View File
@@ -56,7 +56,11 @@ public interface IOnlCgformTagService extends IService<OnlCgformTag> {
*/
OnlCgformTag queryById(String id);
/**
* 分页列表查询
*
* @return
*/
IPage<OnlCgformTag> queryPageList(Map<String, Object> params);
/**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java
+20 -16
View File
@@ -34,6 +34,7 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
@Autowired
private OnlCgformAreaMapper onlCgformAreaMapper;
/**
* 保存
*
@@ -102,8 +103,8 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
@Override
public List<OnlCgformArea> queryList(OnlCgformArea onlCgformArea) {
LambdaQueryWrapper<OnlCgformArea> 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<OnlCgformAreaMapper, O
public List<OnlCgformArea> queryShowArea(String cut, OnlCgformArea onlCgformArea) {
QueryWrapper<OnlCgformArea> 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<OnlCgformArea> 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<OnlCgformAreaMapper, O
* @return
*/
public List<OnlCgformArea> selectShowAreaById(String id) {
QueryWrapper<OnlCgformArea> list=new QueryWrapper<OnlCgformArea>().select(id,"showArea");
QueryWrapper<OnlCgformArea> list = new QueryWrapper<OnlCgformArea>().select(id, "showArea");
return list(list);
}
@Override
public IPage<OnlCgformArea> queryPageList(Map<String, Object> params) {
Integer pageNo=Integer.parseInt(params.get("pageNo").toString());
Integer pageSize=Integer.parseInt(params.get("pageSize").toString());
IPage<OnlCgformArea> 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<OnlCgformArea> result = onlCgformAreaMapper.queryPageList(page, params);
List<OnlCgformArea> records = result.getRecords();
String cut = (String) params.get("cut");
//中英切换-所属模块
if(CutEnum.EN.getValue().equals(cut)){
for(OnlCgformArea data:records){
data.setIsModelName(data.getEnName());
}
}
IPage<OnlCgformArea> result=onlCgformAreaMapper.querPageList(page,params);
return result;
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
+7 -10
View File
@@ -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<OnlCgformTagMapper, Onl
onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0);
} else {
onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0);
onlCgformTag.setCgformHeadId("FileTableIdEnum.FILE_TABLE_ID");//设置文档库-表id
onlCgformTag.setCgformHeadId(FileTableIdEnum.FILE_TABLE_ID.getValue());//设置文档库-表id
onlCgformTag.setDbIsKey(0);
onlCgformTag.setDbIsNull(1);
onlCgformTag.setDbPointLength(0);
@@ -180,19 +181,15 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
IPage page = new Page(pageNo, pageSize);
IPage result = onlCgformTagMapper.queryPageList(page,params);
List<Map<String,Object>> records = result.getRecords();
IPage<OnlCgformTag> result = onlCgformTagMapper.queryPageList(page, params);
List<OnlCgformTag> records = result.getRecords();
String cut = (String) params.get("cut");
//中英切换-属性类型+展示区域列
if(CutEnum.EN.getValue().equals(cut)){
for(Map<String,Object> 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;
}