From c53c57d31371e1fb6ff7904319940f6ac7291981 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Tue, 31 Dec 2024 10:14:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=8F=91=E6=96=87=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/numbers/vo/numbersPageReqVO.java | 17 +++++++------ .../admin/numbers/vo/numbersRespVO.java | 25 +++++++++++-------- .../admin/numbers/vo/numbersSaveReqVO.java | 18 +++++++------ .../dal/dataobject/numbers/numbersDO.java | 20 +++++++++------ .../home/dal/mysql/numbers/numbersMapper.java | 9 ++++--- .../service/numbers/numbersServiceImpl.java | 2 +- 6 files changed, 55 insertions(+), 36 deletions(-) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersPageReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersPageReqVO.java index d9bf3d9..86f4581 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersPageReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersPageReqVO.java @@ -45,17 +45,20 @@ public class numbersPageReqVO extends PageParam { @Schema(description = "数据类型(0=流水号 1=文号)", example = "2") private Integer numbersType; - @Schema(description = "test1") - private String test1; + @Schema(description = "长度选择") + private Integer lengthSelection; - @Schema(description = "test2") - private String test2; + @Schema(description = "映射数据1") + private String mappingData1; - @Schema(description = "test3") - private String test3; + @Schema(description = "映射数据2") + private String mappingData2; + + @Schema(description = "注解") + private String annotation; @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; -} \ No newline at end of file +} diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersRespVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersRespVO.java index b677af7..e8fc2d8 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersRespVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersRespVO.java @@ -56,20 +56,25 @@ public class numbersRespVO { @DictFormat("oa_numbers_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 private Integer numbersType; - @Schema(description = "test1") - @ExcelProperty("test1") - private String test1; + @Schema(description = "长度选择", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty(value = "长度选择", converter = DictConvert.class) + @DictFormat("oa_numbers_length") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + private Integer lengthSelection; - @Schema(description = "test2") - @ExcelProperty("test2") - private String test2; + @Schema(description = "映射数据1") + @ExcelProperty("映射数据1") + private String mappingData1; - @Schema(description = "test3") - @ExcelProperty("test3") - private String test3; + @Schema(description = "映射数据2") + @ExcelProperty("映射数据2") + private String mappingData2; + + @Schema(description = "注解") + @ExcelProperty("注解") + private String annotation; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; -} \ No newline at end of file +} diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersSaveReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersSaveReqVO.java index 5eff40e..1054a00 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/numbers/vo/numbersSaveReqVO.java +++ b/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") - private String test1; + @Schema(description = "长度选择", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotNull(message = "长度选择") + private Integer lengthSelection; - @Schema(description = "test2") - private String test2; + @Schema(description = "映射数据1") + private String mappingData1; - @Schema(description = "test3") - private String test3; + @Schema(description = "映射数据2") + private String mappingData2; -} \ No newline at end of file + @Schema(description = "注解") + private String annotation; + +} diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/numbers/numbersDO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/numbers/numbersDO.java index d3902fc..b115105 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/numbers/numbersDO.java +++ b/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; -} \ No newline at end of file +} diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/numbers/numbersMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/numbers/numbersMapper.java index fbf8d09..9e5b102 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/numbers/numbersMapper.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/numbers/numbersMapper.java @@ -29,11 +29,12 @@ public interface numbersMapper extends BaseMapperX { .eqIfPresent(numbersDO::getLastCode, reqVO.getLastCode()) .eqIfPresent(numbersDO::getEnableMonth, reqVO.getEnableMonth()) .eqIfPresent(numbersDO::getNumbersType, reqVO.getNumbersType()) - .eqIfPresent(numbersDO::getTest1, reqVO.getTest1()) - .eqIfPresent(numbersDO::getTest2, reqVO.getTest2()) - .eqIfPresent(numbersDO::getTest3, reqVO.getTest3()) + .eqIfPresent(numbersDO::getLengthSelection, reqVO.getLengthSelection()) + .eqIfPresent(numbersDO::getMappingData1, reqVO.getMappingData1()) + .eqIfPresent(numbersDO::getMappingData2, reqVO.getMappingData2()) + .eqIfPresent(numbersDO::getAnnotation, reqVO.getAnnotation()) .betweenIfPresent(numbersDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(numbersDO::getId)); } -} \ No newline at end of file +} diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/numbers/numbersServiceImpl.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/numbers/numbersServiceImpl.java index ccd4eed..6e7c2e5 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/numbers/numbersServiceImpl.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/numbers/numbersServiceImpl.java @@ -71,4 +71,4 @@ public class numbersServiceImpl implements numbersService { return numbersMapper.selectPage(pageReqVO); } -} \ No newline at end of file +}