From 5ead2c13b24d4e93dd7ebe6dd85b7e628c9490a7 Mon Sep 17 00:00:00 2001 From: chenhao Date: Fri, 26 Dec 2025 10:28:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(invoice):=20=E5=AE=9E=E7=8E=B0=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将销售方名称改为下拉选择框，支持公司信息自动填充 - 新增公司信息管理模块，包含增删改查功能 - 集成公司信息API接口，支持公司列表查询 - 实现销售方银行信息自动填充功能 - 优化发票申请表单，支持银行信息自动带入 - 更新发票状态筛选，使用字典数据动态渲染选项 - 添加公司信息详情查看功能 - 实现发票备注信息自动生成，包含购销双方银行信息 --- oms_web/oms_vue/src/api/system/companyInfo.js | 44 ++ .../invoice/components/ApplyInvoice.vue | 73 +++- .../src/views/finance/invoice/index.vue | 18 +- .../src/views/system/companyInfo/index.vue | 405 ++++++++++++++++++ .../src/views/system/partner/index.vue | 38 +- .../controller/OmsCompanyInfoController.java | 105 +++++ .../com/ruoyi/sip/domain/OmsCompanyInfo.java | 191 +++++++++ .../com/ruoyi/sip/domain/PartnerInfo.java | 11 +- .../sip/mapper/OmsCompanyInfoMapper.java | 61 +++ .../sip/service/IOmsCompanyInfoService.java | 61 +++ .../impl/OmsCompanyInfoServiceImpl.java | 93 ++++ .../impl/OmsReceivableBillServiceImpl.java | 23 +- .../mapper/sip/OmsCompanyInfoMapper.xml | 115 +++++ .../mapper/system/PartnerInfoMapper.xml | 307 ++++++------- 14 files changed, 1388 insertions(+), 157 deletions(-) create mode 100644 oms_web/oms_vue/src/api/system/companyInfo.js create mode 100644 oms_web/oms_vue/src/views/system/companyInfo/index.vue create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsCompanyInfoController.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsCompanyInfo.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsCompanyInfoMapper.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsCompanyInfoService.java create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsCompanyInfoServiceImpl.java create mode 100644 ruoyi-sip/src/main/resources/mapper/sip/OmsCompanyInfoMapper.xml diff --git a/oms_web/oms_vue/src/api/system/companyInfo.js b/oms_web/oms_vue/src/api/system/companyInfo.js new file mode 100644 index 00000000..55b1e16b --- /dev/null +++ b/oms_web/oms_vue/src/api/system/companyInfo.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询公司信息列表 +export function listCompanyInfo(query) { + return request({ + url: '/sip/companyInfo/list', + method: 'get', + params: query + }) +} + +// 查询公司信息详细 +export function getCompanyInfo(id) { + return request({ + url: '/sip/companyInfo/' + id, + method: 'get' + }) +} + +// 新增公司信息 +export function addCompanyInfo(data) { + return request({ + url: '/sip/companyInfo', + method: 'post', + data: data + }) +} + +// 修改公司信息 +export function updateCompanyInfo(data) { + return request({ + url: '/sip/companyInfo', + method: 'put', + data: data + }) +} + +// 删除公司信息 +export function delCompanyInfo(id) { + return request({ + url: '/sip/companyInfo/' + id, + method: 'delete' + }) +} diff --git a/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue b/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue index 245a5a30..6934e2b3 100644 --- a/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue +++ b/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue @@ -56,7 +56,21 @@
销售方
信息
- + + + @@ -159,6 +173,7 @@ diff --git a/oms_web/oms_vue/src/views/system/partner/index.vue b/oms_web/oms_vue/src/views/system/partner/index.vue index b5ac7847..f1bff4d7 100644 --- a/oms_web/oms_vue/src/views/system/partner/index.vue +++ b/oms_web/oms_vue/src/views/system/partner/index.vue @@ -141,7 +141,7 @@ - + @@ -223,6 +223,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
确 定 @@ -396,6 +427,11 @@ export default { level: null, systemUserId: null, systemUserName: null, + payName: null, + payBankNumber: null, + payBankOpenAddress: null, + bankNumber: null, + socialCredit: null, createAt: null, updatedAt: null }; diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsCompanyInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsCompanyInfoController.java new file mode 100644 index 00000000..b97420af --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OmsCompanyInfoController.java @@ -0,0 +1,105 @@ +package com.ruoyi.sip.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.sip.domain.OmsCompanyInfo; +import com.ruoyi.sip.service.IOmsCompanyInfoService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 公司信息Controller + * + * @author mula + * @date 2025-04-30 + */ +@RestController +@RequestMapping("/sip/companyInfo") +public class OmsCompanyInfoController extends BaseController +{ + @Autowired + private IOmsCompanyInfoService omsCompanyInfoService; + + /** + * 查询公司信息列表 + */ + @RequiresPermissions("sip:companyInfo:list") + @GetMapping("/list") + public TableDataInfo list(OmsCompanyInfo omsCompanyInfo) + { + startPage(); + List list = omsCompanyInfoService.selectOmsCompanyInfoList(omsCompanyInfo); + return getDataTable(list); + } + + /** + * 导出公司信息列表 + */ + @RequiresPermissions("sip:companyInfo:export") + @Log(title = "公司信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, OmsCompanyInfo omsCompanyInfo) + { + List list = omsCompanyInfoService.selectOmsCompanyInfoList(omsCompanyInfo); + ExcelUtil util = new ExcelUtil(OmsCompanyInfo.class); + util.exportExcel(response, list, "公司信息数据"); + } + + /** + * 获取公司信息详细信息 + */ + @RequiresPermissions("sip:companyInfo:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(omsCompanyInfoService.selectOmsCompanyInfoById(id)); + } + + /** + * 新增公司信息 + */ + @RequiresPermissions("sip:companyInfo:add") + @Log(title = "公司信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody OmsCompanyInfo omsCompanyInfo) + { + return toAjax(omsCompanyInfoService.insertOmsCompanyInfo(omsCompanyInfo)); + } + + /** + * 修改公司信息 + */ + @RequiresPermissions("sip:companyInfo:edit") + @Log(title = "公司信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody OmsCompanyInfo omsCompanyInfo) + { + return toAjax(omsCompanyInfoService.updateOmsCompanyInfo(omsCompanyInfo)); + } + + /** + * 删除公司信息 + */ + @RequiresPermissions("sip:companyInfo:remove") + @Log(title = "公司信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(omsCompanyInfoService.deleteOmsCompanyInfoByIds(ids)); + } +} \ No newline at end of file diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsCompanyInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsCompanyInfo.java new file mode 100644 index 00000000..3f3e1ac1 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsCompanyInfo.java @@ -0,0 +1,191 @@ +package com.ruoyi.sip.domain; + +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; + +/** + * 公司信息对象 oms_company_info + * + * @author mula + * @date 2025-04-30 + */ +public class OmsCompanyInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 公司名称 */ + @Excel(name = "公司名称") + private String companyName; + + /** 公司编码 */ + @Excel(name = "公司编码") + private String companyCode; + + /** 联系用户 */ + @Excel(name = "联系用户") + private String companyUser; + + /** 联系邮箱 */ + @Excel(name = "联系邮箱") + private String companyEmail; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String companyPhone; + + /** 公司地址 */ + @Excel(name = "公司地址") + private String companyAddress; + + /** 银行卡号 */ + @Excel(name = "银行卡号") + private String payBankNumber; + + /** 银行开户行 */ + @Excel(name = "银行开户行") + private String payBankOpenAddress; + + /** 银行行号 */ + @Excel(name = "银行行号") + private String bankNumber; + + /** 统一社会信用代码 */ + @Excel(name = "统一社会信用代码") + private String socialCredit; + + /** 账户名称 */ + @Excel(name = "账户名称") + private String payName; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setCompanyName(String companyName) + { + this.companyName = companyName; + } + + public String getCompanyName() + { + return companyName; + } + public void setCompanyCode(String companyCode) + { + this.companyCode = companyCode; + } + + public String getCompanyCode() + { + return companyCode; + } + public void setCompanyUser(String companyUser) + { + this.companyUser = companyUser; + } + + public String getCompanyUser() + { + return companyUser; + } + public void setCompanyEmail(String companyEmail) + { + this.companyEmail = companyEmail; + } + + public String getCompanyEmail() + { + return companyEmail; + } + public void setCompanyPhone(String companyPhone) + { + this.companyPhone = companyPhone; + } + + public String getCompanyPhone() + { + return companyPhone; + } + public void setCompanyAddress(String companyAddress) + { + this.companyAddress = companyAddress; + } + + public String getCompanyAddress() + { + return companyAddress; + } + public void setPayBankNumber(String payBankNumber) + { + this.payBankNumber = payBankNumber; + } + + public String getPayBankNumber() + { + return payBankNumber; + } + public void setPayBankOpenAddress(String payBankOpenAddress) + { + this.payBankOpenAddress = payBankOpenAddress; + } + + public String getPayBankOpenAddress() + { + return payBankOpenAddress; + } + public void setBankNumber(String bankNumber) + { + this.bankNumber = bankNumber; + } + + public String getBankNumber() + { + return bankNumber; + } + public void setSocialCredit(String socialCredit) + { + this.socialCredit = socialCredit; + } + + public String getSocialCredit() + { + return socialCredit; + } + public void setPayName(String payName) + { + this.payName = payName; + } + + public String getPayName() + { + return payName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("companyName", getCompanyName()) + .append("companyCode", getCompanyCode()) + .append("companyUser", getCompanyUser()) + .append("companyEmail", getCompanyEmail()) + .append("companyPhone", getCompanyPhone()) + .append("companyAddress", getCompanyAddress()) + .append("payBankNumber", getPayBankNumber()) + .append("payBankOpenAddress", getPayBankOpenAddress()) + .append("bankNumber", getBankNumber()) + .append("socialCredit", getSocialCredit()) + .append("payName", getPayName()) + .toString(); + } +} \ No newline at end of file diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/PartnerInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/PartnerInfo.java index 99c7c1f6..9a25940a 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/PartnerInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/PartnerInfo.java @@ -69,6 +69,15 @@ public class PartnerInfo extends BaseEntity /** */ private Integer status; - + //账户名称 + private String payName; + //银行卡号 + private String payBankNumber; + //开户行 + private String payBankOpenAddress; + //银行行号 + private String bankNumber; + //统一社会信用代码 + private String socialCredit; } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsCompanyInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsCompanyInfoMapper.java new file mode 100644 index 00000000..de83a47c --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsCompanyInfoMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.sip.mapper; + +import java.util.List; +import com.ruoyi.sip.domain.OmsCompanyInfo; + +/** + * 公司信息Mapper接口 + * + * @author mula + * @date 2025-04-30 + */ +public interface OmsCompanyInfoMapper +{ + /** + * 查询公司信息 + * + * @param id 公司信息主键 + * @return 公司信息 + */ + public OmsCompanyInfo selectOmsCompanyInfoById(Long id); + + /** + * 查询公司信息列表 + * + * @param omsCompanyInfo 公司信息 + * @return 公司信息集合 + */ + public List selectOmsCompanyInfoList(OmsCompanyInfo omsCompanyInfo); + + /** + * 新增公司信息 + * + * @param omsCompanyInfo 公司信息 + * @return 结果 + */ + public int insertOmsCompanyInfo(OmsCompanyInfo omsCompanyInfo); + + /** + * 修改公司信息 + * + * @param omsCompanyInfo 公司信息 + * @return 结果 + */ + public int updateOmsCompanyInfo(OmsCompanyInfo omsCompanyInfo); + + /** + * 删除公司信息 + * + * @param id 公司信息主键 + * @return 结果 + */ + public int deleteOmsCompanyInfoById(Long id); + + /** + * 批量删除公司信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteOmsCompanyInfoByIds(Long[] ids); +} \ No newline at end of file diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsCompanyInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsCompanyInfoService.java new file mode 100644 index 00000000..1248db12 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsCompanyInfoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.sip.service; + +import java.util.List; +import com.ruoyi.sip.domain.OmsCompanyInfo; + +/** + * 公司信息Service接口 + * + * @author mula + * @date 2025-04-30 + */ +public interface IOmsCompanyInfoService +{ + /** + * 查询公司信息 + * + * @param id 公司信息主键 + * @return 公司信息 + */ + public OmsCompanyInfo selectOmsCompanyInfoById(Long id); + + /** + * 查询公司信息列表 + * + * @param omsCompanyInfo 公司信息 + * @return 公司信息集合 + */ + public List selectOmsCompanyInfoList(OmsCompanyInfo omsCompanyInfo); + + /** + * 新增公司信息 + * + * @param omsCompanyInfo 公司信息 + * @return 结果 + */ + public int insertOmsCompanyInfo(OmsCompanyInfo omsCompanyInfo); + + /** + * 修改公司信息 + * + * @param omsCompanyInfo 公司信息 + * @return 结果 + */ + public int updateOmsCompanyInfo(OmsCompanyInfo omsCompanyInfo); + + /** + * 批量删除公司信息 + * + * @param ids 需要删除的公司信息主键集合 + * @return 结果 + */ + public int deleteOmsCompanyInfoByIds(Long[] ids); + + /** + * 删除公司信息信息 + * + * @param id 公司信息主键 + * @return 结果 + */ + public int deleteOmsCompanyInfoById(Long id); +} \ No newline at end of file diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsCompanyInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsCompanyInfoServiceImpl.java new file mode 100644 index 00000000..f15799d4 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsCompanyInfoServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.sip.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.sip.mapper.OmsCompanyInfoMapper; +import com.ruoyi.sip.domain.OmsCompanyInfo; +import com.ruoyi.sip.service.IOmsCompanyInfoService; + +/** + * 公司信息Service业务层处理 + * + * @author mula + * @date 2025-04-30 + */ +@Service +public class OmsCompanyInfoServiceImpl implements IOmsCompanyInfoService +{ + @Autowired + private OmsCompanyInfoMapper omsCompanyInfoMapper; + + /** + * 查询公司信息 + * + * @param id 公司信息主键 + * @return 公司信息 + */ + @Override + public OmsCompanyInfo selectOmsCompanyInfoById(Long id) + { + return omsCompanyInfoMapper.selectOmsCompanyInfoById(id); + } + + /** + * 查询公司信息列表 + * + * @param omsCompanyInfo 公司信息 + * @return 公司信息 + */ + @Override + public List selectOmsCompanyInfoList(OmsCompanyInfo omsCompanyInfo) + { + return omsCompanyInfoMapper.selectOmsCompanyInfoList(omsCompanyInfo); + } + + /** + * 新增公司信息 + * + * @param omsCompanyInfo 公司信息 + * @return 结果 + */ + @Override + public int insertOmsCompanyInfo(OmsCompanyInfo omsCompanyInfo) + { + return omsCompanyInfoMapper.insertOmsCompanyInfo(omsCompanyInfo); + } + + /** + * 修改公司信息 + * + * @param omsCompanyInfo 公司信息 + * @return 结果 + */ + @Override + public int updateOmsCompanyInfo(OmsCompanyInfo omsCompanyInfo) + { + return omsCompanyInfoMapper.updateOmsCompanyInfo(omsCompanyInfo); + } + + /** + * 批量删除公司信息 + * + * @param ids 需要删除的公司信息主键 + * @return 结果 + */ + @Override + public int deleteOmsCompanyInfoByIds(Long[] ids) + { + return omsCompanyInfoMapper.deleteOmsCompanyInfoByIds(ids); + } + + /** + * 删除公司信息信息 + * + * @param id 公司信息主键 + * @return 结果 + */ + @Override + public int deleteOmsCompanyInfoById(Long id) + { + return omsCompanyInfoMapper.deleteOmsCompanyInfoById(id); + } +} \ No newline at end of file diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsReceivableBillServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsReceivableBillServiceImpl.java index eb0a756e..76fe7aee 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsReceivableBillServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsReceivableBillServiceImpl.java @@ -53,6 +53,11 @@ public class OmsReceivableBillServiceImpl implements IOmsReceivableBillService @Autowired private IOmsReceivableInvoicePlanService invoicePlanService; + @Autowired + private IPartnerInfoService partnerInfoService; + + @Autowired + private IOmsCompanyInfoService companyInfoService; @Autowired private IOmsReceivableInvoiceDetailService invoiceDetailService; @Value("${oms.inventory.innerTax:0.13}") @@ -342,7 +347,23 @@ public class OmsReceivableBillServiceImpl implements IOmsReceivableBillService // Set Calculated Tax Info invoiceBill.setTotalPriceWithoutTax(totalWithoutTax); - + List partnerInfos = partnerInfoService.selectPartnerInfoByCode(Collections.singletonList(firstReceivableBill.getPartnerCode())); + if (CollUtil.isNotEmpty(partnerInfos)){ + PartnerInfo partnerInfo = partnerInfos.get(0); + invoiceBill.setBuyerName(partnerInfo.getPartnerName()); + invoiceBill.setBuyerCreditCode(partnerInfo.getSocialCredit()); + invoiceBill.setBuyerBank(partnerInfo.getPayBankOpenAddress()); + invoiceBill.setBuyerBankAccount(partnerInfo.getPayBankNumber()); + } + List omsCompanyInfos = companyInfoService.selectOmsCompanyInfoList(new OmsCompanyInfo()); + if (CollUtil.isNotEmpty(omsCompanyInfos)){ + //todo 后续多个公司 需确认取哪个公司信息 目前只有一个信息 所以默认取第一条数据 + OmsCompanyInfo omsCompanyInfo = omsCompanyInfos.get(0); + invoiceBill.setSellerName(omsCompanyInfo.getCompanyName()); + invoiceBill.setSellerCreditCode(omsCompanyInfo.getSocialCredit()); + invoiceBill.setSellerBank(omsCompanyInfo.getPayBankOpenAddress()); + invoiceBill.setSellerBankAccount(omsCompanyInfo.getPayBankNumber()); + } invoiceBill.setInvoiceBillType(OmsInvoiceBill.InvoiceBillTypeEnum.FROM_RECEIVABLE.getCode()); invoiceBill.setInvoiceStatus(OmsInvoiceBill.InvoiceStatusEnum.WAIT_INVOICE.getCode()); invoiceBillService.insertOmsInvoiceBill(invoiceBill); diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsCompanyInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsCompanyInfoMapper.xml new file mode 100644 index 00000000..6474c4d4 --- /dev/null +++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsCompanyInfoMapper.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + select id, company_name, company_code, company_user, company_email, company_phone, company_address, + pay_bank_number, pay_bank_open_address, bank_number, social_credit, pay_name + from oms_company_info + + + + + + + + insert into oms_company_info + + company_name, + company_code, + company_user, + company_email, + company_phone, + company_address, + pay_bank_number, + pay_bank_open_address, + bank_number, + social_credit, + pay_name, + create_by, + create_time, + + + #{companyName}, + #{companyCode}, + #{companyUser}, + #{companyEmail}, + #{companyPhone}, + #{companyAddress}, + #{payBankNumber}, + #{payBankOpenAddress}, + #{bankNumber}, + #{socialCredit}, + #{payName}, + #{createBy}, + #{createTime}, + + + + + update oms_company_info + + company_name = #{companyName}, + company_code = #{companyCode}, + company_user = #{companyUser}, + company_email = #{companyEmail}, + company_phone = #{companyPhone}, + company_address = #{companyAddress}, + pay_bank_number = #{payBankNumber}, + pay_bank_open_address = #{payBankOpenAddress}, + bank_number = #{bankNumber}, + social_credit = #{socialCredit}, + pay_name = #{payName}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from oms_company_info where id = #{id} + + + + delete from oms_company_info where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-sip/src/main/resources/mapper/system/PartnerInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/system/PartnerInfoMapper.xml index 811379ae..90c94090 100644 --- a/ruoyi-sip/src/main/resources/mapper/system/PartnerInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/system/PartnerInfoMapper.xml @@ -1,144 +1,165 @@ - - - - - - - - - - - - - - - - - - - - - - select t1.id, t1.partner_code, t1.partner_name, t1.contact_email,t1.province, t1.city, t1.address, t1.contact_person, t1.contact_phone - , t1.level, t1.create_at, t1.update_at, t1.delete_at, t1.status,t1.system_user_id,t2.user_name as system_user_name - from partner_info t1 left join sys_user t2 on t1.system_user_id=t2.user_id - - - - - - - - - - - - insert into partner_info - - partner_code, - partner_name, - province, - city, - address, - contact_person, - system_user_id, - contact_phone, - contact_email, - level, - create_at, - update_at, - delete_at, - status, - create_by, - - - #{partnerCode}, - #{partnerName}, - #{province}, - #{city}, - #{address}, - #{contactPerson}, - #{systemUserId}, - #{contactPhone}, - #{contactEmail}, - #{level}, - #{createAt}, - #{updateAt}, - #{deleteAt}, - #{status}, - #{createBy}, - - - - - update partner_info - - partner_code = #{partnerCode}, - partner_name = #{partnerName}, - province = #{province}, - city = #{city}, - system_user_id=#{systemUserId}, - address = #{address}, - contact_email=#{contactEmail}, - contact_person = #{contactPerson}, - contact_phone = #{contactPhone}, - level = #{level}, - create_at = #{createAt}, - update_at = #{updateAt}, - delete_at = #{deleteAt}, - status = #{status}, - update_by = #{updateBy}, - - where id = #{id} - - - - delete from partner_info where id = #{id} - - - - delete from partner_info where id in - - #{id} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + select t1.id, t1.partner_code, t1.partner_name, t1.contact_email,t1.province, t1.city, t1.address, t1.contact_person, t1.contact_phone + , t1.level, t1.create_at, t1.update_at, t1.delete_at, t1.status, t1.pay_name, t1.pay_bank_number, t1.pay_bank_open_address, t1.bank_number, t1.social_credit + , t1.system_user_id, t2.user_name as system_user_name + from partner_info t1 left join sys_user t2 on t1.system_user_id=t2.user_id + + + + + + + + + + + + insert into partner_info + + partner_code, + partner_name, + province, + city, + address, + contact_person, + system_user_id, + contact_phone, + contact_email, + level, + create_at, + update_at, + delete_at, + status, + pay_name, + pay_bank_number, + pay_bank_open_address, + bank_number, + social_credit, + create_by, + + + #{partnerCode}, + #{partnerName}, + #{province}, + #{city}, + #{address}, + #{contactPerson}, + #{systemUserId}, + #{contactPhone}, + #{contactEmail}, + #{level}, + #{createAt}, + #{updateAt}, + #{deleteAt}, + #{status}, + #{payName}, + #{payBankNumber}, + #{payBankOpenAddress}, + #{bankNumber}, + #{socialCredit}, + #{createBy}, + + + + + update partner_info + + partner_code = #{partnerCode}, + partner_name = #{partnerName}, + province = #{province}, + city = #{city}, + system_user_id=#{systemUserId}, + address = #{address}, + contact_email=#{contactEmail}, + contact_person = #{contactPerson}, + contact_phone = #{contactPhone}, + level = #{level}, + create_at = #{createAt}, + update_at = #{updateAt}, + delete_at = #{deleteAt}, + status = #{status}, + pay_name = #{payName}, + pay_bank_number = #{payBankNumber}, + pay_bank_open_address = #{payBankOpenAddress}, + bank_number = #{bankNumber}, + social_credit = #{socialCredit}, + update_by = #{updateBy}, + + where id = #{id} + + + + delete from partner_info where id = #{id} + + + + delete from partner_info where id in + + #{id} + + + \ No newline at end of file