金属元素添加字段

This commit is contained in:
liss
2025-10-23 11:17:08 +08:00
parent 678ee43ebc
commit a04df5982f
5 changed files with 18 additions and 0 deletions

View File

@@ -25,6 +25,9 @@ public class ElementPageReqVO extends PageParam {
@Schema(description = "品位单位") @Schema(description = "品位单位")
private String gradeUnit; private String gradeUnit;
@Schema(description = "小数位数")
private Long decimalValue;
@Schema(description = "创建时间") @Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime; private LocalDateTime[] createTime;

View File

@@ -28,6 +28,10 @@ public class ElementRespVO {
@ExcelProperty("金属元素编码") @ExcelProperty("金属元素编码")
private String coding; private String coding;
@Schema(description = "小数位数", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("小数位数")
private Long decimalValue;
@Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("品位单位") @ExcelProperty("品位单位")
private String gradeUnit; private String gradeUnit;

View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.base.controller.admin.base.vo; 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 io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotEmpty;
import lombok.Data; import lombok.Data;
@@ -23,6 +24,10 @@ public class ElementSaveReqVO {
// @NotEmpty(message = "金属元素编码不能为空") // @NotEmpty(message = "金属元素编码不能为空")
private String coding; private String coding;
@Schema(description = "小数位数")
@NotEmpty(message = "小数位数不能为空")
private Long decimalValue;
@Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "品位单位不能为空") @NotEmpty(message = "品位单位不能为空")
private String gradeUnit; private String gradeUnit;

View File

@@ -44,6 +44,11 @@ public class ElementDO extends BusinessBaseDO {
@TableField("CDG") @TableField("CDG")
private String coding; private String coding;
/** /**
* 小数位数
*/
@TableField("DEC")
private Long decimalValue;
/**
* 品位单位 * 品位单位
*/ */
@TableField("GRD_UNT") @TableField("GRD_UNT")

View File

@@ -19,6 +19,7 @@ public interface ElementMapper extends BaseMapperX<ElementDO> {
return selectPage(reqVO, new LambdaQueryWrapperX<ElementDO>() return selectPage(reqVO, new LambdaQueryWrapperX<ElementDO>()
.eqIfPresent(ElementDO::getAbbreviation, reqVO.getAbbreviation()) .eqIfPresent(ElementDO::getAbbreviation, reqVO.getAbbreviation())
.likeIfPresent(ElementDO::getName, reqVO.getName()) .likeIfPresent(ElementDO::getName, reqVO.getName())
.eqIfPresent(ElementDO::getDecimalValue, reqVO.getDecimalValue())
.eqIfPresent(ElementDO::getCoding, reqVO.getCoding()) .eqIfPresent(ElementDO::getCoding, reqVO.getCoding())
.eqIfPresent(ElementDO::getGradeUnit, reqVO.getGradeUnit()) .eqIfPresent(ElementDO::getGradeUnit, reqVO.getGradeUnit())
.betweenIfPresent(ElementDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(ElementDO::getCreateTime, reqVO.getCreateTime())