diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 504db6bdd..d1b4993f1 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -486,6 +486,7 @@ public class SysDictController { } return result; } + /** * @功能:批量删除 * @param ids diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 31cdfc99b..ce5844196 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -166,7 +166,7 @@ public class SysDictItemController { result.error500("固定字段,不可删除"); } else { - joinSystem.setDelFlag(CommonConstant.DEL_FLAG_1); + sysDictItemService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,id); result.success("删除成功!"); } } @@ -201,6 +201,7 @@ public class SysDictItemController { } return result; } + /** * @功能:批量逻辑删除字典数据 * @param @@ -223,7 +224,7 @@ public class SysDictItemController { if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(joinSystem.getIsReadOnly())) { result.error500("包含固定字段,不可删除"); } else { - joinSystem.setDelFlag(CommonConstant.DEL_FLAG_1); + sysDictItemService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,joinSystem.getId()); result.success("批量删除成功!"); } } @@ -231,6 +232,7 @@ public class SysDictItemController { } return result; } + /** * 字典值重复校验 * @param sysDictItem diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java index 62c0d1704..cc1374374 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java @@ -1,8 +1,10 @@ package com.jero.modules.system.mapper; -import org.apache.ibatis.annotations.Select; -import com.jero.modules.system.entity.SysDictItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.system.entity.SysDictItem; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -20,4 +22,12 @@ public interface SysDictItemMapper extends BaseMapper { @Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1") List selectItemsAll(); + + /** + * 修改状态值 + * @param delFlag + * @param id + */ + @Update("update sys_dict_item set del_flag = #{flag,jdbcType=INTEGER} where id = #{id,jdbcType=VARCHAR}") + public void updateDictDelFlag(@Param("flag") int delFlag, @Param("id") String id); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java index e1ad6ef68..66453da93 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java @@ -21,4 +21,11 @@ public interface ISysDictItemService extends IService { * @return */ public List selectItemsAll(); + + /** + * 修改delFlag + * @param delFlag + * @param id + */ + public void updateDictDelFlag(int delFlag,String id); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java index 3597c2798..bb4c81678 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java @@ -36,4 +36,14 @@ public class SysDictItemServiceImpl extends ServiceImpl selectItemsAll() { return sysDictItemMapper.selectItemsAll(); } + + /** + * 修改delFlag + * @param delFlag + * @param id + */ + @Override + public void updateDictDelFlag(int delFlag, String id) { + baseMapper.updateDictDelFlag(delFlag,id); + } } 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 85dfc1949..b97e9fcbd 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 @@ -162,8 +162,8 @@ public class OnlCgformTagController extends JeroController要处理同步数据库问题!!!! + onlCgformTagService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,id); + //onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");//逻辑删除-->改变状态,数据库不删 result.OK("删除成功!"); } } @@ -213,8 +213,8 @@ public class OnlCgformTagController extends JeroController要处理同步数据库问题!!!! + onlCgformTagService.updateDictDelFlag(CommonConstant.DEL_FLAG_1, midTag.getId()); + //onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");//逻辑删除-->改变状态,数据库不删 result.success("批量删除成功!"); } } 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 4bf5e1ca2..07aeea770 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.tag.entity.OnlCgformTag; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import org.springframework.data.repository.query.Param; import java.util.Map; @@ -31,4 +32,12 @@ public interface OnlCgformTagMapper extends BaseMapper { "and i.dict_id=1493098515761917954 \n" + "order by f.order_num asc ") IPage queryPageList(IPage page,@Param("params") Map params); + + /** + * 修改状态值 + * @param delFlag + * @param id + */ + @Update("update onl_cgform_field set del_flag = #{flag,jdbcType=INTEGER} where id = #{id,jdbcType=VARCHAR}") + public void updateDictDelFlag(@org.apache.ibatis.annotations.Param("flag") int delFlag, @org.apache.ibatis.annotations.Param("id") String id); } 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 3052523c2..da7761c6c 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 @@ -59,6 +59,13 @@ public interface IOnlCgformTagService extends IService { IPage queryPageList(Map params); + /** + * 修改delFlag + * @param delFlag + * @param id + */ + public void updateDictDelFlag(int delFlag,String id); + /** * 列表查询 * 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 19101ffcc..16515665c 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 @@ -72,8 +72,8 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - if (StringUtils.isNotBlank(onlCgformTag.getDbFieldName())) { - queryWrapper.eq("db_field_txt", onlCgformTag.getDbFieldTxt())//字段中文名称 - .eq("field_show_type", onlCgformTag.getFieldShowType())//字段类型 - .eq("db_length",onlCgformTag.getDbLength());//字段长度 - } - Integer countTableData = onlCgformTagMapper.selectCount(queryWrapper); - System.out.println("z这里这里count="+countTableData); - return countTableData; + /** + * 校验名字,类型,长度完全相同的数据,不能加进数据库 + * + * @return + */ + @Override + public Integer queryExitTableData(OnlCgformTag onlCgformTag) { + //设置标签存入数据库的字段类型 + if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.TEXT_NUMBER)){ + onlCgformTag.setDbType("int"); + }else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.DATE_SINGLE) && onlCgformTag.equals(FieldTypeEnum.DATE_MORE)){ + onlCgformTag.setDbType("Date"); + }else{ + onlCgformTag.setDbType("String"); } + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (StringUtils.isNotBlank(onlCgformTag.getDbFieldName())) { + queryWrapper.eq("db_field_txt", onlCgformTag.getDbFieldTxt())//字段中文名称 + .eq("field_show_type", onlCgformTag.getFieldShowType())//字段类型 + .eq("db_length",onlCgformTag.getDbLength());//字段长度 + } + Integer countTableData = onlCgformTagMapper.selectCount(queryWrapper); + return countTableData; + } /** * 更新 * @@ -161,6 +160,17 @@ public class OnlCgformTagServiceImpl extends ServiceImpl