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 73d4caf..459d019 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 @@ -28,6 +28,9 @@ public class ElementPageReqVO extends PageParam { @Schema(description = "小数位数") private Long decimalValue; + @Schema(description = "是否启用") + private String isEnable; + @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 f58b14e..549daf7 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 @@ -36,6 +36,10 @@ public class ElementRespVO { @ExcelProperty("品位单位") private String gradeUnit; + @Schema(description = "是否启用") + @ExcelProperty("是否启用") + private String isEnable; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") 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/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 6c93229..5d5c8e7 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,7 +1,7 @@ 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.Min; import jakarta.validation.constraints.NotEmpty; import lombok.Data; @@ -21,13 +21,15 @@ public class ElementSaveReqVO { private String name; @Schema(description = "金属元素编码", requiredMode = Schema.RequiredMode.REQUIRED) -// @NotEmpty(message = "金属元素编码不能为空") private String coding; @Schema(description = "小数位数") - @NotEmpty(message = "小数位数不能为空") + @Min(value = 1, message = "数值必须大于0") private Long decimalValue; + @Schema(description = "是否启用") + private String isEnable; + @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/controller/admin/base/vo/MaterialOtherSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java index 938f5ea..50265f4 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java @@ -1,6 +1,7 @@ package com.zt.plat.module.base.controller.admin.base.vo; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; import lombok.Data; @Schema(description = "管理后台 - 物料拓展数据新增/修改 Request VO") @@ -38,6 +39,7 @@ public class MaterialOtherSaveReqVO { private String gradeUnit; @Schema(description = "小数位数") + @Min(value = 1, message = "数值必须大于0") private Long decimalValue; @Schema(description = "是否启用") 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 ba2870d..32ed81b 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 @@ -48,6 +48,11 @@ public class ElementDO extends BusinessBaseDO { */ @TableField("DEC") private Long decimalValue; + /** + * 是否启用 + */ + @TableField("IS_ENB") + private String isEnable; /** * 品位单位 */ diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java index ec0d30b..fa89ea4 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java @@ -25,8 +25,8 @@ public interface AccountMapper extends BaseMapperX { .likeIfPresent(AccountDO::getAddress, reqVO.getAddress()) .likeIfPresent(AccountDO::getPhone, reqVO.getPhone()) .eqIfPresent(AccountDO::getBankAccount, reqVO.getBankAccount()) - .eqIfPresent(AccountDO::getCustomerName, reqVO.getCustomerName()) - .eqIfPresent(AccountDO::getCustomerNumber, reqVO.getCustomerNumber()) + .likeIfPresent(AccountDO::getCustomerName, reqVO.getCustomerName()) + .likeIfPresent(AccountDO::getCustomerNumber, reqVO.getCustomerNumber()) .eqIfPresent(AccountDO::getIsEnable, reqVO.getIsEnable()) .eqIfPresent(AccountDO::getAccountNumber, reqVO.getAccountNumber()) .eqIfPresent(AccountDO::getTaxNumber, reqVO.getTaxNumber()) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java index a1e4dca..9f6557a 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java @@ -18,9 +18,9 @@ public interface ContactMapper extends BaseMapperX { default PageResult selectPage(ContactPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(ContactDO::getType, reqVO.getType()) - .eqIfPresent(ContactDO::getContact, reqVO.getContact()) - .eqIfPresent(ContactDO::getTel, reqVO.getTel()) - .eqIfPresent(ContactDO::getCustomerName, reqVO.getCustomerName()) + .likeIfPresent(ContactDO::getContact, reqVO.getContact()) + .likeIfPresent(ContactDO::getTel, reqVO.getTel()) + .likeIfPresent(ContactDO::getCustomerName, reqVO.getCustomerName()) .eqIfPresent(ContactDO::getCustomerNumber, reqVO.getCustomerNumber()) .eqIfPresent(ContactDO::getIsEnable, reqVO.getIsEnable()) .eqIfPresent(ContactDO::getEmail, reqVO.getEmail()) 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 8e91114..83b90bb 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 @@ -20,10 +20,10 @@ public interface ElementMapper extends BaseMapperX { default PageResult selectPage(ElementPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ElementDO::getAbbreviation, reqVO.getAbbreviation()) + .likeIfPresent(ElementDO::getAbbreviation, reqVO.getAbbreviation()) .likeIfPresent(ElementDO::getName, reqVO.getName()) .eqIfPresent(ElementDO::getDecimalValue, reqVO.getDecimalValue()) - .eqIfPresent(ElementDO::getCoding, reqVO.getCoding()) + .likeIfPresent(ElementDO::getCoding, reqVO.getCoding()) .eqIfPresent(ElementDO::getGradeUnit, reqVO.getGradeUnit()) .betweenIfPresent(ElementDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(ElementDO::getId)); diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java index 3ae3887..121a4be 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java @@ -17,12 +17,14 @@ public interface MaterialDestroyMapper extends BaseMapperX { default PageResult selectPage(MaterialDestroyPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialDestroyDO::getUpNumber, reqVO.getUpNumber()) - .eqIfPresent(MaterialDestroyDO::getDownNumber, reqVO.getDownNumber()) + .likeIfPresent(MaterialDestroyDO::getUpNumber, reqVO.getUpNumber()) + .likeIfPresent(MaterialDestroyDO::getUpName, reqVO.getUpName()) + .likeIfPresent(MaterialDestroyDO::getDownNumber, reqVO.getDownNumber()) + .likeIfPresent(MaterialDestroyDO::getDownName, reqVO.getDownName()) .eqIfPresent(MaterialDestroyDO::getRatio, reqVO.getRatio()) .eqIfPresent(MaterialDestroyDO::getOperation, reqVO.getOperation()) .betweenIfPresent(MaterialDestroyDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(MaterialDestroyDO::getSupplierNumber, reqVO.getSupplierNumber()) + .likeIfPresent(MaterialDestroyDO::getSupplierNumber, reqVO.getSupplierNumber()) .likeIfPresent(MaterialDestroyDO::getSupplierName, reqVO.getSupplierName()) .eqIfPresent(MaterialDestroyDO::getIsEnable, reqVO.getIsEnable()) .orderByDesc(MaterialDestroyDO::getId)); diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java index f3ff895..af4a139 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java @@ -20,7 +20,7 @@ public interface MaterialOtherMapper extends BaseMapperX { default PageResult selectPage(MaterialOtherPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialOtherDO::getMaterialNumber, reqVO.getMaterialNumber()) + .likeIfPresent(MaterialOtherDO::getMaterialNumber, reqVO.getMaterialNumber()) .likeIfPresent(MaterialOtherDO::getMaterialName, reqVO.getMaterialName()) .eqIfPresent(MaterialOtherDO::getErpMaterialNumber, reqVO.getErpMaterialNumber()) .likeIfPresent(MaterialOtherDO::getErpMaterialName, reqVO.getErpMaterialName()) diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialSaveReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialSaveReqVO.java index 5267701..df082ac 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialSaveReqVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialSaveReqVO.java @@ -2,6 +2,7 @@ package com.zt.plat.module.erp.controller.admin.erp.vo; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -82,6 +83,7 @@ public class ErpMaterialSaveReqVO { private String gradeUnit; @Schema(description = "小数位数") + @Min(value = 1, message = "数值必须大于0") private Long decimalValue; } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java index ded32ed..d1a9559 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java @@ -20,7 +20,7 @@ public interface ErpMaterialMapper extends BaseMapperX { default PageResult selectPage(ErpMaterialPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ErpMaterialDO::getDownCenterNumber, reqVO.getDownCenterNumber()) + .likeIfPresent(ErpMaterialDO::getDownCenterNumber, reqVO.getDownCenterNumber()) .eqIfPresent(ErpMaterialDO::getCenterNumber, reqVO.getCenterNumber()) .betweenIfPresent(ErpMaterialDO::getCreateDate, reqVO.getCreateDate()) .eqIfPresent(ErpMaterialDO::getMaterialType, reqVO.getMaterialType())