收发文编号更新

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersPageReqVO.java

@@ -45,14 +45,17 @@ public class numbersPageReqVO extends PageParam {
     @Schema(description = "数据类型(0=流水号 1=文号)", example = "2")
     private Integer numbersType;
 
-    @Schema(description = "test1")
+    @Schema(description = "长度选择")
-    private String test1;
+    private Integer lengthSelection;
 
-    @Schema(description = "test2")
+    @Schema(description = "映射数据1")
-    private String test2;
+    private String mappingData1;
 
-    @Schema(description = "test3")
+    @Schema(description = "映射数据2")
-    private String test3;
+    private String mappingData2;
+
+    @Schema(description = "注解")
+    private String annotation;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersRespVO.java

@@ -56,17 +56,22 @@ public class numbersRespVO {
     @DictFormat("oa_numbers_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
     private Integer numbersType;
 
-    @Schema(description = "test1")
+    @Schema(description = "长度选择", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @ExcelProperty("test1")
+    @ExcelProperty(value = "长度选择", converter = DictConvert.class)
-    private String test1;
+    @DictFormat("oa_numbers_length") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+    private Integer lengthSelection;
 
-    @Schema(description = "test2")
+    @Schema(description = "映射数据1")
-    @ExcelProperty("test2")
+    @ExcelProperty("映射数据1")
-    private String test2;
+    private String mappingData1;
 
-    @Schema(description = "test3")
+    @Schema(description = "映射数据2")
-    @ExcelProperty("test3")
+    @ExcelProperty("映射数据2")
-    private String test3;
+    private String mappingData2;
+
+    @Schema(description = "注解")
+    @ExcelProperty("注解")
+    private String annotation;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersSaveReqVO.java

@@ -44,13 +44,17 @@ public class numbersSaveReqVO {
     @NotNull(message = "数据类型(0=流水号 1=文号)不能为空")
     private Integer numbersType;
 
-    @Schema(description = "test1")
+    @Schema(description = "长度选择", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    private String test1;
+    @NotNull(message = "长度选择")
+    private Integer lengthSelection;
 
-    @Schema(description = "test2")
+    @Schema(description = "映射数据1")
-    private String test2;
+    private String mappingData1;
 
-    @Schema(description = "test3")
+    @Schema(description = "映射数据2")
-    private String test3;
+    private String mappingData2;
+
+    @Schema(description = "注解")
+    private String annotation;
 
 }

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/numbers/numbersDO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.home.dal.dataobject.numbers;
 
+import com.sun.xml.bind.v2.TODO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -68,16 +69,21 @@ public class numbersDO extends BaseDO {
      */
     private Integer numbersType;
     /**
-     * test1
+     * 长度选择
+     * 枚举 {@link TODO oa_numbers_length 对应的类}
      */
-    private String test1;
+    private Integer lengthSelection;
     /**
-     * test2
+     * 映射数据1
      */
-    private String test2;
+    private String mappingData1;
     /**
-     * test3
+     * 映射数据2
      */
-    private String test3;
+    private String mappingData2;
+    /**
+     * 注解
+     */
+    private String annotation;
 
 }

yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/numbers/numbersMapper.java

@@ -29,9 +29,10 @@ public interface numbersMapper extends BaseMapperX<numbersDO> {
                 .eqIfPresent(numbersDO::getLastCode, reqVO.getLastCode())
                 .eqIfPresent(numbersDO::getEnableMonth, reqVO.getEnableMonth())
                 .eqIfPresent(numbersDO::getNumbersType, reqVO.getNumbersType())
-                .eqIfPresent(numbersDO::getTest1, reqVO.getTest1())
+                .eqIfPresent(numbersDO::getLengthSelection, reqVO.getLengthSelection())
-                .eqIfPresent(numbersDO::getTest2, reqVO.getTest2())
+                .eqIfPresent(numbersDO::getMappingData1, reqVO.getMappingData1())
-                .eqIfPresent(numbersDO::getTest3, reqVO.getTest3())
+                .eqIfPresent(numbersDO::getMappingData2, reqVO.getMappingData2())
+                .eqIfPresent(numbersDO::getAnnotation, reqVO.getAnnotation())
                 .betweenIfPresent(numbersDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(numbersDO::getId));
     }