From 72b1097c0f566831223437407db0194d50fbd7dd Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Fri, 26 Sep 2025 15:08:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=EF=BC=8C=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E6=9D=A1=E6=AC=BE=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E5=85=AC=E5=8F=B8=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/base/vo/AccountPageReqVO.java | 10 ++++++++++ .../controller/admin/base/vo/AccountRespVO.java | 13 +++++++++++++ .../admin/base/vo/AccountSaveReqVO.java | 12 ++++++++++++ .../admin/base/vo/ContactPageReqVO.java | 7 +++++++ .../controller/admin/base/vo/ContactRespVO.java | 8 ++++++++ .../admin/base/vo/ContactSaveReqVO.java | 8 ++++++++ .../base/dal/dataobject/base/AccountDO.java | 15 +++++++++++++++ .../dal/dataobject/base/CompanyRelaDeptDO.java | 2 +- .../base/dal/dataobject/base/ContactDO.java | 6 ++++++ .../module/base/dal/mysql/base/AccountMapper.java | 3 +++ .../module/base/dal/mysql/base/ContactMapper.java | 4 ++++ .../mapper/base/CompanyRelativityMapper.xml | 2 +- 12 files changed, 88 insertions(+), 2 deletions(-) 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 4b3e86f..beab582 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,5 +1,6 @@ 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 lombok.Data; @@ -32,4 +33,13 @@ public class AccountPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "是否启用") + private String isEnable; + + @Schema(description = "客商公司编码") + private String customerNumber; + + @Schema(description = "客商公司名称") + private String customerName; + } \ 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 0304659..0f82c40 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 @@ -2,6 +2,7 @@ package com.zt.plat.module.base.controller.admin.base.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -40,4 +41,16 @@ public class AccountRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + @Schema(description = "是否启用") + @ExcelProperty("是否启用") + private String isEnable; + + @Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("客商公司编码") + private String customerNumber; + + @Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("客商公司名称") + private String customerName; + } \ 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 a580f27..c0065ed 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 @@ -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; @@ -31,4 +32,15 @@ public class AccountSaveReqVO { @NotEmpty(message = "税号/社会信用代码不能为空") private String taxNumber; + @Schema(description = "是否启用") + @ExcelProperty("是否启用") + private String isEnable; + + @Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "客商公司编码不能为空") + private String customerNumber; + + @Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "客商公司名称不能为空") + private String customerName; } \ 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/ContactPageReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactPageReqVO.java index cc5cfa4..29dc1c6 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactPageReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactPageReqVO.java @@ -1,5 +1,6 @@ package com.zt.plat.module.base.controller.admin.base.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.zt.plat.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -37,4 +38,10 @@ public class ContactPageReqVO extends PageParam { @Schema(description = "是否启用") private String isEnable; + + @TableField("CSTM_NUM") + private String customerNumber; + + @TableField("CSTM_NAME") + private String customerName; } \ 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/ContactRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactRespVO.java index 8145501..eed591f 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactRespVO.java @@ -47,4 +47,12 @@ public class ContactRespVO { @Schema(description = "是否启用") @ExcelProperty("是否启用") private String isEnable; + + @Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("客商公司编码") + private String customerNumber; + + @Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("客商公司名称") + private String customerName; } \ 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/ContactSaveReqVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java index 3a1efb9..d38e8e7 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java @@ -36,4 +36,12 @@ public class ContactSaveReqVO { @Schema(description = "是否启用") private String isEnable; + @Schema(description = "客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "客商公司编码不能为空") + private String customerNumber; + + @Schema(description = "客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "客商公司名称不能为空") + private String customerName; + } \ 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 7a3f02c..630bdf3 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 @@ -3,6 +3,8 @@ package com.zt.plat.module.base.dal.dataobject.base; import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BaseDO; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; import lombok.*; /** * 账户条款 DO @@ -54,6 +56,19 @@ public class AccountDO extends BusinessBaseDO { */ @TableField("TAX_NUM") private String taxNumber; + + /** + * 是否启用 + */ + @TableField("IS_ENB") + private String isEnable; + + @TableField("CSTM_NUM") + private String customerNumber; + + @TableField("CSTM_NAME") + private String customerName; + /** * 公司编号 */ diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelaDeptDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelaDeptDO.java index 517ae16..b501cab 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelaDeptDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelaDeptDO.java @@ -33,7 +33,7 @@ public class CompanyRelaDeptDO { // 公司名称 private String companyName; // 部门编码 - private String deptNumber; + private String companyNumber; // 负责人id private String leaderUserId; // 是否公司 diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java index 853eb1d..ca5306f 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java @@ -100,4 +100,10 @@ public class ContactDO extends BusinessBaseDO { @TableField("UPDATER_NAME") private String updaterName; + @TableField("CSTM_NUM") + private String customerNumber; + + @TableField("CSTM_NAME") + private String customerName; + } \ 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 9530a08..70cb480 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 @@ -20,6 +20,9 @@ public interface AccountMapper extends BaseMapperX { .eqIfPresent(AccountDO::getType, reqVO.getType()) .likeIfPresent(AccountDO::getAccountName, reqVO.getAccountName()) .eqIfPresent(AccountDO::getBankAccount, reqVO.getBankAccount()) + .eqIfPresent(AccountDO::getCustomerName, reqVO.getCustomerName()) + .eqIfPresent(AccountDO::getCustomerNumber, reqVO.getCustomerNumber()) + .eqIfPresent(AccountDO::getIsEnable, reqVO.getIsEnable()) .eqIfPresent(AccountDO::getAccountNumber, reqVO.getAccountNumber()) .eqIfPresent(AccountDO::getTaxNumber, reqVO.getTaxNumber()) .betweenIfPresent(AccountDO::getCreateTime, reqVO.getCreateTime()) 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 6738f99..2791b97 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 @@ -4,6 +4,7 @@ import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.module.base.controller.admin.base.vo.ContactPageReqVO; +import com.zt.plat.module.base.dal.dataobject.base.AccountDO; import com.zt.plat.module.base.dal.dataobject.base.ContactDO; import org.apache.ibatis.annotations.Mapper; @@ -20,6 +21,9 @@ public interface ContactMapper extends BaseMapperX { .eqIfPresent(ContactDO::getType, reqVO.getType()) .eqIfPresent(ContactDO::getContact, reqVO.getContact()) .eqIfPresent(ContactDO::getTel, reqVO.getTel()) + .eqIfPresent(ContactDO::getCustomerName, reqVO.getCustomerName()) + .eqIfPresent(ContactDO::getCustomerNumber, reqVO.getCustomerNumber()) + .eqIfPresent(ContactDO::getIsEnable, reqVO.getIsEnable()) .eqIfPresent(ContactDO::getEmail, reqVO.getEmail()) .eqIfPresent(ContactDO::getFax, reqVO.getFax()) .eqIfPresent(ContactDO::getAddress, reqVO.getAddress()) diff --git a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml index edbcc58..441b241 100644 --- a/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml +++ b/zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml @@ -17,7 +17,7 @@ c.NUM as erpNumber, c.NAME as erpName, d.NAME as companyName, - d.CODE as deptId, + d.CODE as companyNumber, d.LEADER_USER_ID as leaderUserId, d.IS_COMPANY as isCompany , d.IS_GROUP as isGroup,