diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountPageReqVO.java index bea67e2..3ac1d8b 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountPageReqVO.java @@ -1,7 +1,9 @@ package com.zt.plat.module.base.controller.admin.base.vo; +import com.alibaba.excel.annotation.ExcelProperty; import com.zt.plat.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -41,4 +43,10 @@ public class AccountPageReqVO extends PageParam { @Schema(description = "客商公司名称") private String customerName; + @Schema(description = "地址") + private String address; + + @Schema(description = "电话") + private String phone; + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountRespVO.java index 2a18a62..67640d1 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountRespVO.java @@ -52,4 +52,12 @@ public class AccountRespVO { @ExcelProperty("客商公司名称") private String customerName; + @Schema(description = "地址") + @ExcelProperty("地址") + private String address; + + @Schema(description = "电话") + @ExcelProperty("电话") + private String phone; + } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountSaveReqVO.java index c0065ed..f1ab15c 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountSaveReqVO.java @@ -33,7 +33,6 @@ public class AccountSaveReqVO { private String taxNumber; @Schema(description = "是否启用") - @ExcelProperty("是否启用") private String isEnable; @Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED) @@ -43,4 +42,10 @@ public class AccountSaveReqVO { @Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "客商公司名称不能为空") private String customerName; + + @Schema(description = "地址") + private String address; + + @Schema(description = "电话") + private String phone; } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java index c652096..e7fe4d2 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java @@ -32,7 +32,7 @@ public class CompanyRelativityPageReqVO extends PageParam { @Schema(description = "负责人") private String manager; - @Schema(description = "部门来源") + @Schema(description = "部门来源(字典编码:sply_cpn_rel_sts)(1:外部部门;2:同步部门;)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private String departmentSource; } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java index d52b76e..f6c5954 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java @@ -2,6 +2,7 @@ package com.zt.plat.module.base.dal.dataobject.base; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; /** * 账户条款 DO @@ -102,4 +103,10 @@ public class AccountDO extends BusinessBaseDO { @TableField("UPDATER_NAME") private String updaterName; + @TableField("ADDRESS") + private String address; + + @TableField("PHONE") + private String phone; + } \ No newline at end of file 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 70cb480..efe89ce 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 @@ -19,6 +19,8 @@ public interface AccountMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(AccountDO::getType, reqVO.getType()) .likeIfPresent(AccountDO::getAccountName, reqVO.getAccountName()) + .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())