update 主数据明细校验优化

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysMasterDataDetailController.java

@@ -64,7 +64,7 @@ public class SysMasterDataDetailController extends BaseController {
     @PostMapping("/export")
     public void export(SysMasterDataDetailBo bo, HttpServletResponse response) {
         List<SysMasterDataDetailVo> list = sysMasterDataDetailService.queryList(bo);
-        ExcelUtil.exportExcel(list, "主数据维护明细", SysMasterDataDetailVo.class, response);
+        ExcelUtil.exportExcel(list, "信息", SysMasterDataDetailVo.class, response);
     }
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMasterDataDetailBo.java

@@ -43,13 +43,15 @@ public class SysMasterDataDetailBo extends BaseEntity {
     /**
      * 主数据明细编号
      */
-    @NotBlank(message = "主数据明细编号不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "编号不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 1, max = 64, message = "编号长度必须在 1 到 64 之间", groups = {AddGroup.class, EditGroup.class})
     private String dataDetailCode;
 
     /**
      * 主数据明细名称
      */
     @NotBlank(message = "主数据明细名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 1, max = 255, message = "名称长度必须在 1 到 255 之间", groups = {AddGroup.class, EditGroup.class})
     private String dataDetailName;
 
     /**
@@ -93,5 +95,6 @@ public class SysMasterDataDetailBo extends BaseEntity {
     @NotBlank(message = "激活标识(1是 0否)不能为空", groups = {AddGroup.class, EditGroup.class})
     private String activeFlag;
 
-
+    private String selectDataDetailCode;
+    private String selectDataDetailName;
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMasterDataDetailVo.java

@@ -31,73 +31,71 @@ public class SysMasterDataDetailVo implements Serializable {
     /**
      * 主键标识
      */
-    @ExcelProperty(value = "主键标识")
     private Long masterDataDetailId;
 
     /**
      * 主数据ID
      */
-    @ExcelProperty(value = "主数据ID")
     private Long masterDataId;
 
     /**
      * 父级标识
      */
-    @ExcelProperty(value = "父级标识")
+//    @ExcelProperty(value = "父级标识")
     private Long parentId;
 
     /**
      * 祖级列表
      */
-    @ExcelProperty(value = "祖级列表")
+//    @ExcelProperty(value = "祖级列表")
     private String ancestors;
 
     /**
      * 主数据明细编号
      */
-    @ExcelProperty(value = "主数据明细编号")
+    @ExcelProperty(value = "编号")
     private String dataDetailCode;
 
     /**
      * 主数据明细名称
      */
-    @ExcelProperty(value = "主数据明细名称")
+    @ExcelProperty(value = "名称")
     private String dataDetailName;
 
     /**
      * 预留字段1数据
      */
-    @ExcelProperty(value = "预留字段1数据")
+//    @ExcelProperty(value = "预留字段1数据")
     private String fieldData1;
 
     /**
      * 预留字段2数据
      */
-    @ExcelProperty(value = "预留字段2数据")
+//    @ExcelProperty(value = "预留字段2数据")
     private String fieldData2;
 
     /**
      * 预留字段3数据
      */
-    @ExcelProperty(value = "预留字段3数据")
+//    @ExcelProperty(value = "预留字段3数据")
     private String fieldData3;
 
     /**
      * 预留字段4数据
      */
-    @ExcelProperty(value = "预留字段4数据")
+//    @ExcelProperty(value = "预留字段4数据")
     private String fieldData4;
 
     /**
      * 预留字段5数据
      */
-    @ExcelProperty(value = "预留字段5数据")
+//    @ExcelProperty(value = "预留字段5数据")
     private String fieldData5;
 
     /**
      * 显示排序
      */
-    @ExcelProperty(value = "显示排序")
+//    @ExcelProperty(value = "显示排序")
     private Long displaySort;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMasterDataDetailServiceImpl.java

@@ -78,8 +78,10 @@ public class SysMasterDataDetailServiceImpl implements ISysMasterDataDetailServi
         .eq(bo.getMasterDataId() != null, SysMasterDataDetail::getMasterDataId, bo.getMasterDataId())
         .eq(bo.getParentId() != null, SysMasterDataDetail::getParentId, bo.getParentId())
         .eq(StringUtils.isNotBlank(bo.getAncestors()), SysMasterDataDetail::getAncestors, bo.getAncestors())
-        .eq(StringUtils.isNotBlank(bo.getDataDetailCode()), SysMasterDataDetail::getDataDetailCode, bo.getDataDetailCode())
+        .like(StringUtils.isNotBlank(bo.getDataDetailCode()), SysMasterDataDetail::getDataDetailCode, bo.getDataDetailCode())
+        .eq(StringUtils.isNotBlank(bo.getSelectDataDetailCode()), SysMasterDataDetail::getDataDetailCode, bo.getSelectDataDetailCode())
         .like(StringUtils.isNotBlank(bo.getDataDetailName()), SysMasterDataDetail::getDataDetailName, bo.getDataDetailName())
+        .eq(StringUtils.isNotBlank(bo.getSelectDataDetailName()), SysMasterDataDetail::getDataDetailName, bo.getSelectDataDetailName())
         .eq(StringUtils.isNotBlank(bo.getFieldData1()), SysMasterDataDetail::getFieldData1, bo.getFieldData1())
         .eq(StringUtils.isNotBlank(bo.getFieldData2()), SysMasterDataDetail::getFieldData2, bo.getFieldData2())
         .eq(StringUtils.isNotBlank(bo.getFieldData3()), SysMasterDataDetail::getFieldData3, bo.getFieldData3())
@@ -129,12 +131,21 @@ public class SysMasterDataDetailServiceImpl implements ISysMasterDataDetailServi
         //编号校验
         SysMasterDataDetailBo detailBo = new SysMasterDataDetailBo();
         detailBo.setMasterDataId(entity.getMasterDataId());
-        detailBo.setDataDetailCode(entity.getDataDetailCode());
+        detailBo.setSelectDataDetailCode(entity.getDataDetailCode());
         MPJLambdaWrapper<SysMasterDataDetail> lqw = buildQueryWrapper(detailBo);
         SysMasterDataDetail detail = baseMapper.selectOne(lqw);
         if (StringUtils.isNotNull(detail) && !entity.getMasterDataDetailId().equals(detail.getMasterDataDetailId())){
             throw new ServiceException("编码已存在");
         }
+        //名称校验
+        SysMasterDataDetailBo detailNameBo = new SysMasterDataDetailBo();
+        detailNameBo.setMasterDataId(entity.getMasterDataId());
+        detailNameBo.setSelectDataDetailName(entity.getDataDetailName());
+        MPJLambdaWrapper<SysMasterDataDetail> lqwn = buildQueryWrapper(detailNameBo);
+        SysMasterDataDetail detailName = baseMapper.selectOne(lqwn);
+        if (StringUtils.isNotNull(detailName) && !entity.getMasterDataDetailId().equals(detailName.getMasterDataDetailId())){
+            throw new ServiceException("名称已存在");
+        }
     }
 
     /**