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

标签内容修改

Browse Source
This commit is contained in:
xiejunyu
2022-03-16 18:06:54 +08:00
parent 7b7b901182
commit b6cf71f3f9
4 changed files with 38 additions and 23 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
-10
View File
@@ -152,15 +152,5 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
@Deprecated
public Page<DictModel> queryDictTablePageList(Page page, @Param("query") DictQuery query);
@Select("select d.id,d.create_by,d.create_time,d.update_by,d.update_time,\n" +
"d.dict_name,d.dict_code,d.description,d.del_flag,d.type,\n" +
"d.dict_en_name,d.is_tag_dict,d.is_read_only,d.attribute_type as attribute_type_value,\n" +
"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\" and d.del_flag=0\n" +
"order by d.create_time desc")
IPage<SysDict> queryPageList(IPage page,@Param("params") Map<String,Object> params);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml
+23
View File
@@ -127,4 +127,27 @@
</if>
</select>
<select id="queryPageList" resultType="com.jero.modules.system.entity.SysDict">
select d.id,d.create_by,d.create_time,d.update_by,d.update_time,
d.dict_name,d.dict_code,d.description,d.del_flag,d.type,
d.dict_en_name,d.is_tag_dict,d.is_read_only,d.attribute_type,
i.item_text as attribute_type_name,i.en_name as attribute_type_en_name
from sys_dict as d
left join sys_dict_item as i on d.attribute_type=i.item_value
where i.dict_id="1494570247913512962" and d.del_flag=0
<if test="params.cut='cn'">
<if test="params.dictName != null and params.dictName != ''">
and d.dict_en_name like concat('%',#{params.dictName},'%')
</if>
</if>
<if test="params.cut='en'">
<if test="params.dictName != null and params.dictName != ''">
and d.dict_en_name like concat('%',#{params.dictName},'%')
</if>
</if>
order by f.create_time desc
</select>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml
+12 -10
View File
@@ -41,17 +41,19 @@
where f.cgform_head_id="48308196e7b04761b533dc31bc899707"
and f.is_delete=0
and i.dict_id=1493098515761917954
<if test="params.cut='cn'">
<if test="params.dbFieldTxt != null and params.dbFieldTxt != ''">
and f.db_field_txt like concat('%',#{params.dbFieldTxt},'%')
</if>
</if>
<!--<choose>
<when test="params.cut='cn' ">
<if test="params.dbFieldTxt != null and params.dbFieldTxt != ''">
and f.db_field_txt like concat('%',#{params.dbFieldTxt},'%')
</if>
</when>
<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>
<otherwise>
<if test="params.dbFieldTxt != null and params.dbFieldTxt != ''">
and f.db_field_en_name like concat('%',#{params.dbFieldTxt},'%')
</if>
</otherwise>
</choose>-->
<if test="params.showArea != null and params.showArea != '' ">
and f.show_area like concat('%',#{params.showArea},'%')
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
+3 -3
View File
@@ -71,8 +71,8 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
onlCgformTag.setCreateTime(now);
onlCgformTag.setUpdateTime(now);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
onlCgformTag.setCreateBy(sysUser.getUsername());
onlCgformTag.setUpdateBy(sysUser.getUsername());
onlCgformTag.setCreateBy(sysUser.getRealname());
onlCgformTag.setUpdateBy(sysUser.getRealname());
String pinYin = HanYuPinYinUtil.changeToNumberPinYin(onlCgformTag.getDbFieldTxt());
onlCgformTag.setDbFieldName(pinYin.replace(" ","_"));
if(StringUtils.isNotBlank(onlCgformTag.getDbFieldEnName())){
@@ -187,7 +187,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
//中英切换-属性类型+展示区域列
if(CutEnum.EN.getValue().equals(cut)){
for(OnlCgformTag data:records){
data.setFieldShowTypeName(data.getDbFieldEnName());
data.setFieldShowTypeName(data.getFieldShowTypeEnName());
data.setShowAreaName(data.getShowAreaEnName());
}
}