From a04df5982fc649a8777739d31e61ee2bb681b8d5 Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Thu, 23 Oct 2025 11:17:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E5=B1=9E=E5=85=83=E7=B4=A0=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/admin/base/vo/ElementPageReqVO.java | 3 +++ .../module/base/controller/admin/base/vo/ElementRespVO.java | 4 ++++ .../base/controller/admin/base/vo/ElementSaveReqVO.java | 5 +++++ .../zt/plat/module/base/dal/dataobject/base/ElementDO.java | 5 +++++ .../zt/plat/module/base/dal/mysql/base/ElementMapper.java | 1 + 5 files changed, 18 insertions(+) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java index a93ea20..73d4caf 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java @@ -25,6 +25,9 @@ public class ElementPageReqVO extends PageParam { @Schema(description = "品位单位") private String gradeUnit; + @Schema(description = "小数位数") + private Long decimalValue; + @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java index 9f7c0fe..f58b14e 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java @@ -28,6 +28,10 @@ public class ElementRespVO { @ExcelProperty("金属元素编码") private String coding; + @Schema(description = "小数位数", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("小数位数") + private Long decimalValue; + @Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("品位单位") private String gradeUnit; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java index eafee0c..6c93229 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java @@ -1,5 +1,6 @@ package com.zt.plat.module.base.controller.admin.base.vo; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; import lombok.Data; @@ -23,6 +24,10 @@ public class ElementSaveReqVO { // @NotEmpty(message = "金属元素编码不能为空") private String coding; + @Schema(description = "小数位数") + @NotEmpty(message = "小数位数不能为空") + private Long decimalValue; + @Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "品位单位不能为空") private String gradeUnit; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java index 39c3250..ba2870d 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java @@ -44,6 +44,11 @@ public class ElementDO extends BusinessBaseDO { @TableField("CDG") private String coding; /** + * 小数位数 + */ + @TableField("DEC") + private Long decimalValue; + /** * 品位单位 */ @TableField("GRD_UNT") diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java index 665280c..24b5a91 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java @@ -19,6 +19,7 @@ public interface ElementMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(ElementDO::getAbbreviation, reqVO.getAbbreviation()) .likeIfPresent(ElementDO::getName, reqVO.getName()) + .eqIfPresent(ElementDO::getDecimalValue, reqVO.getDecimalValue()) .eqIfPresent(ElementDO::getCoding, reqVO.getCoding()) .eqIfPresent(ElementDO::getGradeUnit, reqVO.getGradeUnit()) .betweenIfPresent(ElementDO::getCreateTime, reqVO.getCreateTime())