From 1cdd413965c6ee59588d77f8419586d3e3b0e7b1 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 9 Nov 2023 16:57:24 +0800 Subject: [PATCH] =?UTF-8?q?fix=2077968=20=E6=A0=87=E7=AD=BE=E7=AE=A1?= =?UTF-8?q?=E7=90=86--=E6=A0=87=E7=AD=BE=E9=A1=B9=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86--=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=90=8E=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA=E5=90=8C=E5=90=8D?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E7=AD=BE=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/tag/mapper/LawsTagMapper.java | 11 +- .../modules/tag/mapper/xml/LawsTagMapper.xml | 141 +++++++++++++++++- .../tag/service/impl/ILawsTagServiceImpl.java | 23 +-- 3 files changed, 164 insertions(+), 11 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/tag/mapper/LawsTagMapper.java b/laws-modules/src/main/java/com/jero/modules/tag/mapper/LawsTagMapper.java index 443153a4..bc9d6206 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/mapper/LawsTagMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/tag/mapper/LawsTagMapper.java @@ -1,11 +1,12 @@ package com.jero.modules.tag.mapper; +import org.apache.ibatis.annotations.Param; +import java.util.Date; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.tag.entity.LawsTag; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Update; -import org.springframework.data.repository.query.Param; import java.util.List; import java.util.Map; @@ -50,4 +51,12 @@ public interface LawsTagMapper extends BaseMapper { @org.apache.ibatis.annotations.Param("condition") String condition); void executeDDL(@Param("sqlStr") String var1); + + + LawsTag selectDeleteData(@Param("isModel")String isModel, @Param("dbFieldEnName")String dbFieldEnName, @Param("dbFieldTxt")String dbFieldTxt); + + int updateAllById(@Param("updated")LawsTag updated); + + + } diff --git a/laws-modules/src/main/java/com/jero/modules/tag/mapper/xml/LawsTagMapper.xml b/laws-modules/src/main/java/com/jero/modules/tag/mapper/xml/LawsTagMapper.xml index 1ab92a94..3f6dc339 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/mapper/xml/LawsTagMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/tag/mapper/xml/LawsTagMapper.xml @@ -1,6 +1,28 @@ + + id, + create_by, + create_time, + update_by, + update_time, + is_model, + db_field_txt, + db_field_en_name, + field_show_type, + db_length, + order_num, + field_must_input, + is_show_form, + is_show_list, + is_read_only, + show_area, + is_query, + is_show_laws_list, + is_show_search, + delFlag + @@ -24,7 +46,21 @@ - + + + + + + + + + + + + + + + + select + * + from laws_tag + where is_model=#{isModel} and db_field_en_name=#{dbFieldEnName} and db_field_txt=#{dbFieldTxt} and del_flag = 1 + + + + + update laws_tag + + + is_model = #{updated.isModel}, + + + db_field_txt = #{updated.dbFieldTxt}, + + + db_field_en_name = #{updated.dbFieldEnName}, + + + field_show_type = #{updated.fieldShowType}, + + + db_length = #{updated.dbLength}, + + + order_num = #{updated.orderNum}, + + + field_must_input = #{updated.fieldMustInput}, + + + is_show_form = #{updated.isShowForm}, + + + is_show_list = #{updated.isShowList}, + + + is_read_only = #{updated.isReadOnly}, + + + show_area = #{updated.showArea}, + + + is_query = #{updated.isQuery}, + + + is_show_laws_list = #{updated.isShowLawsList}, + + + is_show_search = #{updated.isShowSearch}, + + + del_flag = #{updated.delFlag}, + + + table_name = #{updated.tableName}, + + + db_field_name = #{updated.dbFieldName}, + + + db_field_name_old = #{updated.dbFieldNameOld}, + + + dict_id = #{updated.dictId}, + + + dict_field = #{updated.dictField}, + + + dict_table = #{updated.dictTable}, + + + dict_text = #{updated.dictText}, + + + sort_flag = #{updated.sortFlag}, + + + is_show_form_create = #{updated.isShowFormCreate}, + + + db_is_key = #{updated.dbIsKey}, + + + db_is_null = #{updated.dbIsNull}, + + + db_point_length = #{updated.dbPointLength}, + + + db_type = #{updated.dbType}, + + + field_href = #{updated.fieldHref}, + + + where id=#{updated.id} + \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java index 9dc9cbee..c0c8041f 100644 --- a/laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java @@ -61,17 +61,12 @@ public class ILawsTagServiceImpl extends ServiceImpl imp public void add(LawsTag lawsTag) { //校验--逻辑删除 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(LawsTag::getIsModel, lawsTag.getIsModel()) - .eq(LawsTag::getDbFieldTxt, lawsTag.getDbFieldTxt()) - .eq(LawsTag::getDbFieldEnName, lawsTag.getDbFieldEnName()) - .eq(LawsTag::getDelFlag,1); - LawsTag lawsTag1 = lawsTagMapper.selectOne(queryWrapper); + LawsTag lawsTag1 = lawsTagMapper.selectDeleteData(lawsTag.getIsModel(),lawsTag.getDbFieldEnName(),lawsTag.getDbFieldTxt()); if (lawsTag1 != null){ lawsTag.setId(lawsTag1.getId()); lawsTag.setDbFieldNameOld(lawsTag1.getDbFieldName()); } - else { + //处理DBLength为null的情况，默认为100 if (lawsTag.getDbLength() == null){ lawsTag.setDbLength(100); @@ -108,13 +103,23 @@ public class ILawsTagServiceImpl extends ServiceImpl imp if (dbFieldName.length() > 64){ throw new JeroBootException("tag.add.字段名称太长",dbFieldName); } + + if (lawsTag1 != null){ + executeDDL(lawsTag,"modify"); + }else { + executeDDL(lawsTag,"add"); } - executeDDL(lawsTag,"add"); + String isModel = lawsTag.getIsModel(); String tableName = TableNameEnum.getTableName(isModel); lawsTag.setTableName(tableName); lawsTag.setDbFieldNameOld(lawsTag.getDbFieldName()); - saveOrUpdate(lawsTag); + if (lawsTag1 != null){ + lawsTagMapper.updateAllById(lawsTag); + }else { + saveOrUpdate(lawsTag); + } + }