zgty/zt-base
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
liss
2025-10-29 18:45:48 +08:00
parent ad54444ea8
commit 09e76c0cdc
12 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java
View File

@@ -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;

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java
View File

@@ -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;

8
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java
View File

@@ -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;

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java
View File

@@ -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 = "是否启用")

5
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java
View File

@@ -48,6 +48,11 @@ public class ElementDO extends BusinessBaseDO {
*/
@TableField("DEC")
private Long decimalValue;
/**
* 是否启用
*/
@TableField("IS_ENB")
private String isEnable;
/**
* 品位单位
*/

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java
View File

@@ -25,8 +25,8 @@ public interface AccountMapper extends BaseMapperX<AccountDO> {
.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())

6
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java
View File

@@ -18,9 +18,9 @@ public interface ContactMapper extends BaseMapperX<ContactDO> {
default PageResult<ContactDO> selectPage(ContactPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ContactDO>()
.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())

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java
View File

@@ -20,10 +20,10 @@ public interface ElementMapper extends BaseMapperX<ElementDO> {
default PageResult<ElementDO> selectPage(ElementPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ElementDO>()
.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));

8
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java
View File

@@ -17,12 +17,14 @@ public interface MaterialDestroyMapper extends BaseMapperX<MaterialDestroyDO> {
default PageResult<MaterialDestroyDO> selectPage(MaterialDestroyPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialDestroyDO>()
.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));

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java
View File

@@ -20,7 +20,7 @@ public interface MaterialOtherMapper extends BaseMapperX<MaterialOtherDO> {
default PageResult<MaterialOtherDO> selectPage(MaterialOtherPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<MaterialOtherDO>()
.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())