客户/供应商 子表分开,id改回自增
This commit is contained in:
luojiaquan
2026-09-10 14:43:51 +08:00
parent 05c8d3f90d
commit 9e99a4a6c2
20 changed files with 1810 additions and 737 deletions
@@ -3,12 +3,16 @@ package com.ruoyi.customer.supplierinfo.domain;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.customer.customerinfo.domain.BmsCustomerAttachment;
import com.ruoyi.customer.customerinfo.domain.BmsCustomerCompany;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplierAttachment;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplierCompany;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplierContact;
/**
* 供应商主对象 bms_supplier
@@ -16,12 +20,13 @@ import com.ruoyi.customer.customerinfo.domain.BmsCustomerCompany;
* @author ruoyi
* @date 2026-09-09
*/
@Data
public class BmsSupplier extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 供应商ID(UUID) */
private String supplierId;
/** 供应商ID */
private Long supplierId;
/** 供应商编码 */
@Excel(name = "供应商编码")
@@ -108,6 +113,7 @@ public class BmsSupplier extends BaseEntity
private BigDecimal throwRatio;
/** 合作开始日期 */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "合作开始日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date cooperationStartDate;
@@ -118,108 +124,17 @@ public class BmsSupplier extends BaseEntity
/** 绑定的渠道/服务ID */
private String channelIds;
/** 附件列表(子表 bms_customer_attachment 共用) */
private List<BmsCustomerAttachment> attachmentList;
/** 附件列表(子表 bms_supplier_attachment) */
private List<BmsSupplierAttachment> attachmentList;
/** 公司主体列表(子表 bms_customer_company 共用) */
private List<BmsCustomerCompany> companyList;
/** 公司主体列表(子表 bms_supplier_company) */
private List<BmsSupplierCompany> companyList;
/** 联系人列表(子表 bms_supplier_contact) */
private List<BmsSupplierContact> contactList;
/** 删除标记(0正常 2删除) */
private String delFlag;
public void setSupplierId(String supplierId) { this.supplierId = supplierId; }
public String getSupplierId() { return supplierId; }
public void setSupplierCode(String supplierCode) { this.supplierCode = supplierCode; }
public String getSupplierCode() { return supplierCode; }
public void setSupplierName(String supplierName) { this.supplierName = supplierName; }
public String getSupplierName() { return supplierName; }
public void setSupplierCodeDw(String supplierCodeDw) { this.supplierCodeDw = supplierCodeDw; }
public String getSupplierCodeDw() { return supplierCodeDw; }
public void setCreditCode(String creditCode) { this.creditCode = creditCode; }
public String getCreditCode() { return creditCode; }
public void setSupplierType(String supplierType) { this.supplierType = supplierType; }
public String getSupplierType() { return supplierType; }
public void setIsEnable(String isEnable) { this.isEnable = isEnable; }
public String getIsEnable() { return isEnable; }
public void setPurchaserUserId(String purchaserUserId) { this.purchaserUserId = purchaserUserId; }
public String getPurchaserUserId() { return purchaserUserId; }
public void setPurchaserUser(String purchaserUser) { this.purchaserUser = purchaserUser; }
public String getPurchaserUser() { return purchaserUser; }
public void setSettlementUserId(String settlementUserId) { this.settlementUserId = settlementUserId; }
public String getSettlementUserId() { return settlementUserId; }
public void setSettlementUser(String settlementUser) { this.settlementUser = settlementUser; }
public String getSettlementUser() { return settlementUser; }
public void setServiceUserId(String serviceUserId) { this.serviceUserId = serviceUserId; }
public String getServiceUserId() { return serviceUserId; }
public void setServiceUser(String serviceUser) { this.serviceUser = serviceUser; }
public String getServiceUser() { return serviceUser; }
public void setEd(BigDecimal ed) { this.ed = ed; }
public BigDecimal getEd() { return ed; }
public void setZq(Long zq) { this.zq = zq; }
public Long getZq() { return zq; }
public void setSettlementType(String settlementType) { this.settlementType = settlementType; }
public String getSettlementType() { return settlementType; }
public void setTempEd(BigDecimal tempEd) { this.tempEd = tempEd; }
public BigDecimal getTempEd() { return tempEd; }
public void setAccountBalance(BigDecimal accountBalance) { this.accountBalance = accountBalance; }
public BigDecimal getAccountBalance() { return accountBalance; }
public void setForeignCurrencyBalance(BigDecimal foreignCurrencyBalance) { this.foreignCurrencyBalance = foreignCurrencyBalance; }
public BigDecimal getForeignCurrencyBalance() { return foreignCurrencyBalance; }
public void setCreditEd(BigDecimal creditEd) { this.creditEd = creditEd; }
public BigDecimal getCreditEd() { return creditEd; }
public void setWeightThreshold(BigDecimal weightThreshold) { this.weightThreshold = weightThreshold; }
public BigDecimal getWeightThreshold() { return weightThreshold; }
public void setThrowRatio(BigDecimal throwRatio) { this.throwRatio = throwRatio; }
public BigDecimal getThrowRatio() { return throwRatio; }
public void setCooperationStartDate(Date cooperationStartDate) { this.cooperationStartDate = cooperationStartDate; }
public Date getCooperationStartDate() { return cooperationStartDate; }
public void setCooperationStatus(String cooperationStatus) { this.cooperationStatus = cooperationStatus; }
public String getCooperationStatus() { return cooperationStatus; }
public void setChannelIds(String channelIds) { this.channelIds = channelIds; }
public String getChannelIds() { return channelIds; }
public void setAttachmentList(List<BmsCustomerAttachment> attachmentList) { this.attachmentList = attachmentList; }
public List<BmsCustomerAttachment> getAttachmentList() { return attachmentList; }
public void setCompanyList(List<BmsCustomerCompany> companyList) { this.companyList = companyList; }
public List<BmsCustomerCompany> getCompanyList() { return companyList; }
public void setDelFlag(String delFlag) { this.delFlag = delFlag; }
public String getDelFlag() { return delFlag; }
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("supplierId", getSupplierId())
.append("supplierCode", getSupplierCode())
.append("supplierName", getSupplierName())
.append("supplierCodeDw", getSupplierCodeDw())
.append("creditCode", getCreditCode())
.append("supplierType", getSupplierType())
.append("isEnable", getIsEnable())
.append("purchaserUserId", getPurchaserUserId())
.append("purchaserUser", getPurchaserUser())
.append("settlementUserId", getSettlementUserId())
.append("settlementUser", getSettlementUser())
.append("serviceUserId", getServiceUserId())
.append("serviceUser", getServiceUser())
.append("ed", getEd())
.append("zq", getZq())
.append("settlementType", getSettlementType())
.append("tempEd", getTempEd())
.append("accountBalance", getAccountBalance())
.append("foreignCurrencyBalance", getForeignCurrencyBalance())
.append("creditEd", getCreditEd())
.append("weightThreshold", getWeightThreshold())
.append("throwRatio", getThrowRatio())
.append("cooperationStartDate", getCooperationStartDate())
.append("cooperationStatus", getCooperationStatus())
.append("channelIds", getChannelIds())
.append("attachmentList", getAttachmentList())
.append("companyList", getCompanyList())
.append("remark", getRemark())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("delFlag", getDelFlag())
.toString();
}
}
@@ -0,0 +1,62 @@
package com.ruoyi.customer.supplierinfo.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 供应商附件对象 bms_supplier_attachment
*
* @author ruoyi
* @date 2026-09-10
*/
@Data
public class BmsSupplierAttachment extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 附件ID */
private Long attachmentId;
/** 所属供应商ID */
@Excel(name = "供应商ID")
private Long supplierId;
/** 文件原始名称 */
@Excel(name = "文件原始名称")
private String fileName;
/** 文件存储路径 */
@Excel(name = "文件存储路径")
private String filePath;
/** 文件大小(字节) */
@Excel(name = "文件大小")
private Long fileSize;
/** 文件类型 */
@Excel(name = "文件类型")
private String fileType;
/** 文件扩展名 */
@Excel(name = "文件扩展名")
private String fileExtension;
/** 附件类型(0附件资料 1供应商Logo 2合同文件 3其他) */
@Excel(name = "附件类型", readConverterExp = "0=附件资料,1=供应商Logo,2=合同文件,3=其他")
private String attachmentType;
/** 是否Logo(0否 1是) */
@Excel(name = "是否Logo", readConverterExp = "0=否,1=是")
private String isLogo;
/** 排序 */
@Excel(name = "排序")
private Integer sortOrder;
/** 删除标记(0正常 2删除) */
private String delFlag;
}
@@ -0,0 +1,147 @@
package com.ruoyi.customer.supplierinfo.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 供应商公司主体(工商信息)对象 bms_supplier_company
*
* @author ruoyi
* @date 2026-09-10
*/
@Data
public class BmsSupplierCompany extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 公司主体ID */
private Long companyId;
/** 所属供应商ID */
@Excel(name = "供应商ID")
private Long supplierId;
/** 公司全称 */
@Excel(name = "公司全称")
private String companyNameFull;
/** 公司英文名称 */
@Excel(name = "公司英文名称")
private String englishName;
/** 统一社会信用代码 */
@Excel(name = "统一社会信用代码")
private String creditCode;
/** 法定代表人 */
@Excel(name = "法定代表人")
private String legalPerson;
/** 法定代表人电话 */
@Excel(name = "法定代表人电话")
private String legalPersonPhone;
/** 法定代表人身份证号 */
private String legalPersonIdCard;
/** 注册资本(万元) */
@Excel(name = "注册资本", cellType = Excel.ColumnType.NUMERIC)
private BigDecimal registeredCapital;
/** 注册资本币种 */
@Excel(name = "注册资本币种")
private String capitalCurrency;
/** 实收资本(万元) */
@Excel(name = "实收资本", cellType = Excel.ColumnType.NUMERIC)
private BigDecimal paidInCapital;
/** 成立日期 */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "成立日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date establishDate;
/** 营业期限起始日 */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "营业期限起始日", width = 30, dateFormat = "yyyy-MM-dd")
private Date businessTermStart;
/** 营业期限终止日 */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "营业期限终止日", width = 30, dateFormat = "yyyy-MM-dd")
private Date businessTermEnd;
/** 是否长期有效(0否 1是) */
@Excel(name = "是否长期有效", readConverterExp = "0=否,1=是")
private String businessTermPermanent;
/** 登记机关 */
@Excel(name = "登记机关")
private String registrationAuthority;
/** 注册号 */
@Excel(name = "注册号")
private String registrationNumber;
/** 经营状态 */
@Excel(name = "经营状态")
private String operatingStatus;
/** 经营范围 */
private String businessScope;
/** 主要股东信息 */
private String shareholders;
/** 员工人数 */
@Excel(name = "员工人数")
private Integer employeeCount;
/** 公司电话 */
@Excel(name = "公司电话")
private String companyPhone;
/** 公司传真 */
@Excel(name = "公司传真")
private String companyFax;
/** 公司网址 */
@Excel(name = "公司网址")
private String companyWebsite;
/** 公司邮箱 */
@Excel(name = "公司邮箱")
private String companyEmail;
/** 注册省份 */
@Excel(name = "注册省份")
private String registeredProvince;
/** 注册城市 */
@Excel(name = "注册城市")
private String registeredCity;
/** 注册区县 */
@Excel(name = "注册区县")
private String registeredDistrict;
/** 注册详细地址 */
@Excel(name = "注册详细地址")
private String registeredAddressDetail;
/** 营业执照(oss_id) */
private Long businessLicenseOssId;
/** 其他附件(oss_id逗号分隔) */
private String attachmentIds;
/** 删除标记(0正常 2删除) */
private String delFlag;
}
@@ -0,0 +1,98 @@
package com.ruoyi.customer.supplierinfo.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 供应商联系人对象 bms_supplier_contact
*
* @author ruoyi
* @date 2026-09-10
*/
@Data
public class BmsSupplierContact extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 联系人ID */
private Long contactId;
/** 所属供应商ID */
@Excel(name = "供应商ID")
private Long supplierId;
/** 联系人姓名 */
@Excel(name = "联系人姓名")
private String contactName;
/** 职位 */
@Excel(name = "职位")
private String position;
/** 所属部门 */
@Excel(name = "所属部门")
private String department;
/** 手机号 */
@Excel(name = "手机号")
private String phone;
/** 座机 */
@Excel(name = "座机")
private String landline;
/** 电子邮箱 */
@Excel(name = "电子邮箱")
private String email;
/** 微信号 */
@Excel(name = "微信号")
private String wechat;
/** QQ号 */
@Excel(name = "QQ号")
private String qq;
/** 国家/地区 */
@Excel(name = "国家/地区")
private String country;
/** 省份 */
@Excel(name = "省份")
private String province;
/** 城市 */
@Excel(name = "城市")
private String city;
/** 区/县 */
@Excel(name = "区/县")
private String district;
/** 联系详细地址 */
@Excel(name = "联系详细地址")
private String contactAddress;
/** 邮政编码 */
@Excel(name = "邮政编码")
private String postalCode;
/** 是否默认联系人(0否 1是) */
@Excel(name = "是否默认联系人", readConverterExp = "0=否,1=是")
private String isDefault;
/** 联系人类型(0业务联系人 1财务联系人 2紧急联系人 3其他) */
@Excel(name = "联系人类型", readConverterExp = "0=业务联系人,1=财务联系人,2=紧急联系人,3=其他")
private String contactType;
/** 排序 */
@Excel(name = "排序")
private Integer sortOrder;
/** 删除标记(0正常 2删除) */
private String delFlag;
}
@@ -2,6 +2,9 @@ package com.ruoyi.customer.supplierinfo.mapper;
import java.util.List;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplier;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplierAttachment;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplierCompany;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplierContact;
/**
* 供应商主Mapper接口
@@ -12,7 +15,7 @@ import com.ruoyi.customer.supplierinfo.domain.BmsSupplier;
public interface BmsSupplierMapper
{
/** 查询供应商 */
public BmsSupplier selectBmsSupplierBySupplierId(String supplierId);
public BmsSupplier selectBmsSupplierBySupplierId(Long supplierId);
/** 查询供应商列表 */
public List<BmsSupplier> selectBmsSupplierList(BmsSupplier bmsSupplier);
@@ -24,8 +27,59 @@ public interface BmsSupplierMapper
public int updateBmsSupplier(BmsSupplier bmsSupplier);
/** 删除供应商 */
public int deleteBmsSupplierBySupplierId(String supplierId);
public int deleteBmsSupplierBySupplierId(Long supplierId);
/** 批量删除供应商 */
public int deleteBmsSupplierBySupplierIds(String[] supplierIds);
public int deleteBmsSupplierBySupplierIds(Long[] supplierIds);
/** 查询供应商附件列表 */
public List<BmsSupplierAttachment> selectBmsSupplierAttachmentList(BmsSupplierAttachment bmsSupplierAttachment);
/** 新增供应商附件 */
public int insertBmsSupplierAttachment(BmsSupplierAttachment bmsSupplierAttachment);
/** 修改供应商附件 */
public int updateBmsSupplierAttachment(BmsSupplierAttachment bmsSupplierAttachment);
/** 按供应商ID删除附件(逻辑删除) */
public int deleteBmsSupplierAttachmentBySupplierId(Long supplierId);
/** 按附件ID删除(逻辑删除) */
public int deleteBmsSupplierAttachmentByAttachmentId(Long attachmentId);
/** 查询供应商公司主体列表 */
public List<BmsSupplierCompany> selectBmsSupplierCompanyList(BmsSupplierCompany bmsSupplierCompany);
/** 按ID查询供应商公司主体 */
public BmsSupplierCompany selectBmsSupplierCompanyByCompanyId(Long companyId);
/** 新增供应商公司主体 */
public int insertBmsSupplierCompany(BmsSupplierCompany bmsSupplierCompany);
/** 修改供应商公司主体 */
public int updateBmsSupplierCompany(BmsSupplierCompany bmsSupplierCompany);
/** 按供应商ID删除公司主体(逻辑删除) */
public int deleteBmsSupplierCompanyBySupplierId(Long supplierId);
/** 按公司ID删除(逻辑删除) */
public int deleteBmsSupplierCompanyByCompanyId(Long companyId);
/** 查询供应商联系人列表 */
public List<BmsSupplierContact> selectBmsSupplierContactList(BmsSupplierContact bmsSupplierContact);
/** 按ID查询供应商联系人 */
public BmsSupplierContact selectBmsSupplierContactByContactId(Long contactId);
/** 新增供应商联系人 */
public int insertBmsSupplierContact(BmsSupplierContact bmsSupplierContact);
/** 修改供应商联系人 */
public int updateBmsSupplierContact(BmsSupplierContact bmsSupplierContact);
/** 按供应商ID删除联系人(逻辑删除) */
public int deleteBmsSupplierContactBySupplierId(Long supplierId);
/** 按联系人ID删除(逻辑删除) */
public int deleteBmsSupplierContactByContactId(Long contactId);
}
@@ -1,9 +1,10 @@
package com.ruoyi.customer.supplierinfo.service;
import java.util.List;
import com.ruoyi.customer.customerinfo.domain.BmsCustomerAttachment;
import com.ruoyi.customer.customerinfo.domain.BmsCustomerCompany;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplier;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplierAttachment;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplierCompany;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplierContact;
/**
* 供应商主Service接口
@@ -14,7 +15,7 @@ import com.ruoyi.customer.supplierinfo.domain.BmsSupplier;
public interface IBmsSupplierService
{
/** 查询供应商 */
public BmsSupplier selectBmsSupplierBySupplierId(String supplierId);
public BmsSupplier selectBmsSupplierBySupplierId(Long supplierId);
/** 查询供应商列表 */
public List<BmsSupplier> selectBmsSupplierList(BmsSupplier bmsSupplier);
@@ -26,14 +27,53 @@ public interface IBmsSupplierService
public int updateBmsSupplier(BmsSupplier bmsSupplier);
/** 批量删除供应商 */
public int deleteBmsSupplierBySupplierIds(String[] supplierIds);
public int deleteBmsSupplierBySupplierIds(Long[] supplierIds);
/** 删除供应商 */
public int deleteBmsSupplierBySupplierId(String supplierId);
public int deleteBmsSupplierBySupplierId(Long supplierId);
/** 查询供应商附件列表(子表共用) */
public List<BmsCustomerAttachment> selectBmsSupplierAttachmentList(BmsCustomerAttachment attachment);
/** 查询供应商附件列表 */
public List<BmsSupplierAttachment> selectBmsSupplierAttachmentList(BmsSupplierAttachment attachment);
/** 查询供应商公司主体列表(子表共用) */
public List<BmsCustomerCompany> selectBmsSupplierCompanyList(BmsCustomerCompany company);
/** 按供应商ID删除附件 */
public int deleteBmsSupplierAttachmentBySupplierId(Long supplierId);
/** 批量保存供应商附件(随主表提交时调用) */
public void saveBmsSupplierAttachments(Long supplierId, List<BmsSupplierAttachment> attachmentList);
/** 查询供应商公司主体列表 */
public List<BmsSupplierCompany> selectBmsSupplierCompanyList(BmsSupplierCompany company);
/** 按ID查询供应商公司主体 */
public BmsSupplierCompany selectBmsSupplierCompanyByCompanyId(Long companyId);
/** 新增供应商公司主体(独立接口,用于子表新增按钮) */
public int insertBmsSupplierCompany(BmsSupplierCompany bmsSupplierCompany);
/** 修改供应商公司主体 */
public int updateBmsSupplierCompany(BmsSupplierCompany bmsSupplierCompany);
/** 删除供应商公司主体 */
public int deleteBmsSupplierCompanyByCompanyIds(Long[] companyIds);
/** 批量保存供应商公司主体(随主表提交时调用) */
public void saveBmsSupplierCompanies(Long supplierId, List<BmsSupplierCompany> companyList);
/** 查询供应商联系人列表 */
public List<BmsSupplierContact> selectBmsSupplierContactList(BmsSupplierContact bmsSupplierContact);
/** 按ID查询供应商联系人 */
public BmsSupplierContact selectBmsSupplierContactByContactId(Long contactId);
/** 新增供应商联系人(独立接口,用于子表新增按钮) */
public int insertBmsSupplierContact(BmsSupplierContact bmsSupplierContact);
/** 修改供应商联系人 */
public int updateBmsSupplierContact(BmsSupplierContact bmsSupplierContact);
/** 删除供应商联系人 */
public int deleteBmsSupplierContactByContactIds(Long[] contactIds);
/** 批量保存供应商联系人(随主表提交时调用) */
public void saveBmsSupplierContacts(Long supplierId, List<BmsSupplierContact> contactList);
}
@@ -5,11 +5,10 @@ import java.util.List;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.customer.customerinfo.domain.BmsCustomerAttachment;
import com.ruoyi.customer.customerinfo.domain.BmsCustomerCompany;
import com.ruoyi.customer.customerinfo.mapper.BmsCustomerMapper;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplier;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplierAttachment;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplierCompany;
import com.ruoyi.customer.supplierinfo.domain.BmsSupplierContact;
import com.ruoyi.customer.supplierinfo.mapper.BmsSupplierMapper;
import com.ruoyi.customer.supplierinfo.service.IBmsSupplierService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,23 +27,21 @@ public class BmsSupplierServiceImpl implements IBmsSupplierService
@Autowired
private BmsSupplierMapper bmsSupplierMapper;
/** 子表 Mapper 复用客户模块(bms_customer_attachment / bms_customer_company 物理表共用,customer_id 列实际存 supplier_id) */
@Autowired
private BmsCustomerMapper bmsCustomerMapper;
@Override
public BmsSupplier selectBmsSupplierBySupplierId(String supplierId)
public BmsSupplier selectBmsSupplierBySupplierId(Long supplierId)
{
BmsSupplier bmsSupplier = bmsSupplierMapper.selectBmsSupplierBySupplierId(supplierId);
if (bmsSupplier != null)
{
// 复用子表查询,customer_id 实际传入 supplier_id
BmsCustomerAttachment attachQuery = new BmsCustomerAttachment();
attachQuery.setCustomerId(supplierId);
bmsSupplier.setAttachmentList(bmsCustomerMapper.selectBmsCustomerAttachmentList(attachQuery));
BmsCustomerCompany companyQuery = new BmsCustomerCompany();
companyQuery.setCustomerId(supplierId);
bmsSupplier.setCompanyList(bmsCustomerMapper.selectBmsCustomerCompanyList(companyQuery));
BmsSupplierAttachment attachQuery = new BmsSupplierAttachment();
attachQuery.setSupplierId(supplierId);
bmsSupplier.setAttachmentList(bmsSupplierMapper.selectBmsSupplierAttachmentList(attachQuery));
BmsSupplierCompany companyQuery = new BmsSupplierCompany();
companyQuery.setSupplierId(supplierId);
bmsSupplier.setCompanyList(bmsSupplierMapper.selectBmsSupplierCompanyList(companyQuery));
BmsSupplierContact contactQuery = new BmsSupplierContact();
contactQuery.setSupplierId(supplierId);
bmsSupplier.setContactList(bmsSupplierMapper.selectBmsSupplierContactList(contactQuery));
}
return bmsSupplier;
}
@@ -56,30 +53,28 @@ public class BmsSupplierServiceImpl implements IBmsSupplierService
}
@Override
public List<BmsCustomerAttachment> selectBmsSupplierAttachmentList(BmsCustomerAttachment attachment)
public List<BmsSupplierAttachment> selectBmsSupplierAttachmentList(BmsSupplierAttachment attachment)
{
return bmsCustomerMapper.selectBmsCustomerAttachmentList(attachment);
return bmsSupplierMapper.selectBmsSupplierAttachmentList(attachment);
}
@Override
public List<BmsCustomerCompany> selectBmsSupplierCompanyList(BmsCustomerCompany company)
public int deleteBmsSupplierAttachmentBySupplierId(Long supplierId)
{
return bmsCustomerMapper.selectBmsCustomerCompanyList(company);
return bmsSupplierMapper.deleteBmsSupplierAttachmentBySupplierId(supplierId);
}
/**
* 批量保存供应商附件(复用子表,把 supplierId 设置到 customerId 字段)
*/
private void saveBmsSupplierAttachments(String supplierId, List<BmsCustomerAttachment> attachmentList)
@Override
public void saveBmsSupplierAttachments(Long supplierId, List<BmsSupplierAttachment> attachmentList)
{
if (attachmentList == null || attachmentList.isEmpty())
{
return;
}
SysUser user = SecurityUtils.getLoginUser().getUser();
for (BmsCustomerAttachment item : attachmentList)
for (BmsSupplierAttachment item : attachmentList)
{
item.setCustomerId(supplierId);
item.setSupplierId(supplierId);
if (item.getDelFlag() == null)
{
item.setDelFlag("0");
@@ -88,30 +83,73 @@ public class BmsSupplierServiceImpl implements IBmsSupplierService
{
item.setUpdateBy(user.getUserName());
item.setUpdateTime(DateUtils.getNowDate());
bmsCustomerMapper.updateBmsCustomerAttachment(item);
bmsSupplierMapper.updateBmsSupplierAttachment(item);
}
else
{
item.setCreateBy(user.getUserName());
item.setCreateTime(DateUtils.getNowDate());
bmsCustomerMapper.insertBmsCustomerAttachment(item);
bmsSupplierMapper.insertBmsSupplierAttachment(item);
}
}
}
/**
* 批量保存供应商公司主体(复用子表,把 supplierId 设置到 customerId 字段)
*/
private void saveBmsSupplierCompanies(String supplierId, List<BmsCustomerCompany> companyList)
@Override
public List<BmsSupplierCompany> selectBmsSupplierCompanyList(BmsSupplierCompany company)
{
return bmsSupplierMapper.selectBmsSupplierCompanyList(company);
}
@Override
public BmsSupplierCompany selectBmsSupplierCompanyByCompanyId(Long companyId)
{
return bmsSupplierMapper.selectBmsSupplierCompanyByCompanyId(companyId);
}
@Override
public int insertBmsSupplierCompany(BmsSupplierCompany bmsSupplierCompany)
{
SysUser user = SecurityUtils.getLoginUser().getUser();
bmsSupplierCompany.setCreateBy(user.getUserName());
bmsSupplierCompany.setCreateTime(DateUtils.getNowDate());
if (bmsSupplierCompany.getDelFlag() == null)
{
bmsSupplierCompany.setDelFlag("0");
}
return bmsSupplierMapper.insertBmsSupplierCompany(bmsSupplierCompany);
}
@Override
public int updateBmsSupplierCompany(BmsSupplierCompany bmsSupplierCompany)
{
SysUser user = SecurityUtils.getLoginUser().getUser();
bmsSupplierCompany.setUpdateBy(user.getUserName());
bmsSupplierCompany.setUpdateTime(DateUtils.getNowDate());
return bmsSupplierMapper.updateBmsSupplierCompany(bmsSupplierCompany);
}
@Override
public int deleteBmsSupplierCompanyByCompanyIds(Long[] companyIds)
{
int rows = 0;
for (Long companyId : companyIds)
{
rows += bmsSupplierMapper.deleteBmsSupplierCompanyByCompanyId(companyId);
}
return rows;
}
@Override
public void saveBmsSupplierCompanies(Long supplierId, List<BmsSupplierCompany> companyList)
{
if (companyList == null || companyList.isEmpty())
{
return;
}
SysUser user = SecurityUtils.getLoginUser().getUser();
for (BmsCustomerCompany item : companyList)
for (BmsSupplierCompany item : companyList)
{
item.setCustomerId(supplierId);
item.setSupplierId(supplierId);
if (item.getDelFlag() == null)
{
item.setDelFlag("0");
@@ -120,13 +158,88 @@ public class BmsSupplierServiceImpl implements IBmsSupplierService
{
item.setUpdateBy(user.getUserName());
item.setUpdateTime(DateUtils.getNowDate());
bmsCustomerMapper.updateBmsCustomerCompany(item);
bmsSupplierMapper.updateBmsSupplierCompany(item);
}
else
{
item.setCreateBy(user.getUserName());
item.setCreateTime(DateUtils.getNowDate());
bmsCustomerMapper.insertBmsCustomerCompany(item);
bmsSupplierMapper.insertBmsSupplierCompany(item);
}
}
}
@Override
public List<BmsSupplierContact> selectBmsSupplierContactList(BmsSupplierContact bmsSupplierContact)
{
return bmsSupplierMapper.selectBmsSupplierContactList(bmsSupplierContact);
}
@Override
public BmsSupplierContact selectBmsSupplierContactByContactId(Long contactId)
{
return bmsSupplierMapper.selectBmsSupplierContactByContactId(contactId);
}
@Override
public int insertBmsSupplierContact(BmsSupplierContact bmsSupplierContact)
{
SysUser user = SecurityUtils.getLoginUser().getUser();
bmsSupplierContact.setCreateBy(user.getUserName());
bmsSupplierContact.setCreateTime(DateUtils.getNowDate());
if (bmsSupplierContact.getDelFlag() == null)
{
bmsSupplierContact.setDelFlag("0");
}
return bmsSupplierMapper.insertBmsSupplierContact(bmsSupplierContact);
}
@Override
public int updateBmsSupplierContact(BmsSupplierContact bmsSupplierContact)
{
SysUser user = SecurityUtils.getLoginUser().getUser();
bmsSupplierContact.setUpdateBy(user.getUserName());
bmsSupplierContact.setUpdateTime(DateUtils.getNowDate());
return bmsSupplierMapper.updateBmsSupplierContact(bmsSupplierContact);
}
@Override
public int deleteBmsSupplierContactByContactIds(Long[] contactIds)
{
int rows = 0;
for (Long contactId : contactIds)
{
rows += bmsSupplierMapper.deleteBmsSupplierContactByContactId(contactId);
}
return rows;
}
@Override
public void saveBmsSupplierContacts(Long supplierId, List<BmsSupplierContact> contactList)
{
if (contactList == null || contactList.isEmpty())
{
return;
}
SysUser user = SecurityUtils.getLoginUser().getUser();
for (BmsSupplierContact item : contactList)
{
item.setSupplierId(supplierId);
if (item.getDelFlag() == null)
{
item.setDelFlag("0");
}
if (item.getContactId() != null)
{
item.setUpdateBy(user.getUserName());
item.setUpdateTime(DateUtils.getNowDate());
bmsSupplierMapper.updateBmsSupplierContact(item);
}
else
{
item.setCreateBy(user.getUserName());
item.setCreateTime(DateUtils.getNowDate());
bmsSupplierMapper.insertBmsSupplierContact(item);
}
}
}
@@ -136,8 +249,6 @@ public class BmsSupplierServiceImpl implements IBmsSupplierService
public int insertBmsSupplier(BmsSupplier bmsSupplier)
{
SysUser user = SecurityUtils.getLoginUser().getUser();
// 应用层生成 UUID,与客户 UUID 互不冲突,子表 customer_id 列可同时容纳两者
bmsSupplier.setSupplierId(IdUtils.simpleUUID());
bmsSupplier.setCreateTime(DateUtils.getNowDate());
bmsSupplier.setCreateBy(user.getUserName());
int rows = bmsSupplierMapper.insertBmsSupplier(bmsSupplier);
@@ -145,6 +256,7 @@ public class BmsSupplierServiceImpl implements IBmsSupplierService
{
saveBmsSupplierAttachments(bmsSupplier.getSupplierId(), bmsSupplier.getAttachmentList());
saveBmsSupplierCompanies(bmsSupplier.getSupplierId(), bmsSupplier.getCompanyList());
saveBmsSupplierContacts(bmsSupplier.getSupplierId(), bmsSupplier.getContactList());
}
return rows;
}
@@ -156,11 +268,11 @@ public class BmsSupplierServiceImpl implements IBmsSupplierService
SysUser user = SecurityUtils.getLoginUser().getUser();
bmsSupplier.setUpdateTime(DateUtils.getNowDate());
bmsSupplier.setUpdateBy(user.getUserName());
// 附件先逻辑删除再重建(与客户模块保持一致)
bmsCustomerMapper.deleteBmsCustomerAttachmentByCustomerId(bmsSupplier.getSupplierId());
// 附件先逻辑删除再重建(全量替换)
bmsSupplierMapper.deleteBmsSupplierAttachmentBySupplierId(bmsSupplier.getSupplierId());
if (bmsSupplier.getAttachmentList() != null)
{
for (BmsCustomerAttachment item : bmsSupplier.getAttachmentList())
for (BmsSupplierAttachment item : bmsSupplier.getAttachmentList())
{
item.setAttachmentId(null);
}
@@ -168,27 +280,31 @@ public class BmsSupplierServiceImpl implements IBmsSupplierService
}
// 公司主体采用增量 upsert
saveBmsSupplierCompanies(bmsSupplier.getSupplierId(), bmsSupplier.getCompanyList());
// 联系人采用增量 upsert
saveBmsSupplierContacts(bmsSupplier.getSupplierId(), bmsSupplier.getContactList());
return bmsSupplierMapper.updateBmsSupplier(bmsSupplier);
}
@Transactional(rollbackFor = Exception.class)
@Override
public int deleteBmsSupplierBySupplierIds(String[] supplierIds)
public int deleteBmsSupplierBySupplierIds(Long[] supplierIds)
{
for (String supplierId : supplierIds)
for (Long supplierId : supplierIds)
{
bmsCustomerMapper.deleteBmsCustomerAttachmentByCustomerId(supplierId);
bmsCustomerMapper.deleteBmsCustomerCompanyByCustomerId(supplierId);
bmsSupplierMapper.deleteBmsSupplierAttachmentBySupplierId(supplierId);
bmsSupplierMapper.deleteBmsSupplierCompanyBySupplierId(supplierId);
bmsSupplierMapper.deleteBmsSupplierContactBySupplierId(supplierId);
}
return bmsSupplierMapper.deleteBmsSupplierBySupplierIds(supplierIds);
}
@Transactional(rollbackFor = Exception.class)
@Override
public int deleteBmsSupplierBySupplierId(String supplierId)
public int deleteBmsSupplierBySupplierId(Long supplierId)
{
bmsCustomerMapper.deleteBmsCustomerAttachmentByCustomerId(supplierId);
bmsCustomerMapper.deleteBmsCustomerCompanyByCustomerId(supplierId);
bmsSupplierMapper.deleteBmsSupplierAttachmentBySupplierId(supplierId);
bmsSupplierMapper.deleteBmsSupplierCompanyBySupplierId(supplierId);
bmsSupplierMapper.deleteBmsSupplierContactBySupplierId(supplierId);
return bmsSupplierMapper.deleteBmsSupplierBySupplierId(supplierId);
}
}