diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCustomerAddressController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCustomerAddressController.java index 9e6ec21..da61b46 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCustomerAddressController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCustomerAddressController.java @@ -1,11 +1,11 @@ -/** +/** * @Project: emis * @Title: EmisCustomerAddressController.java * @author linfso * @date 2024-03-01 04:47:51 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

客户收寄件地址 控制器

*/ @@ -26,10 +26,11 @@ import com.xdadan.erp.oms.common.enums.BusinessType; import com.xdadan.erp.oms.domain.EmisCustomerAddress; import com.xdadan.erp.oms.service.IEmisCustomerAddressService; +import com.xdadan.erp.oms.domain.exception.EmisBizError; /** * 客户收寄件地址Controller - * + * * @author linfso * @date 2024-03-01 04:47:51 */ @@ -54,11 +55,13 @@ public class Oms2cCustomerAddressController extends BaseController return getDataTable(list); } -// @PreAuthorize("@ss.hasPermi('emis:emisCustomerAddress:list')") - @JacksonFilter(include= {"id","name","phone","country","province","city","county","countryName","provinceName","cityName","countyName","town","townName","address","postCode","email","company","blDefaultFlag","orderNum","createTime","remark"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + // @PreAuthorize("@ss.hasPermi('emis:emisCustomerAddress:list')") + @JacksonFilter(include = { "id", "name", "phone", "country", "province", "city", "county", "countryName", + "provinceName", "cityName", "countyName", "town", "townName", "address", "postCode", "email", "company", + "blDefaultFlag", "orderNum", "createTime", "remark", "enterpriseName", + "enterpriseTaxId" }, value = EmisCustomerAddress.class, type = JacksonFilter.JscksonFilterType.RESPONSE) @RequestMapping("/listSimple") - public TableDataInfo listSimple(EmisCustomerAddress emisCustomerAddress) - { + public TableDataInfo listSimple(EmisCustomerAddress emisCustomerAddress) { // 需要限制，除总部外，只能查看站点自有数据 startPage(); // emisCustomerAddress.setUserId(getLoginUser().getUser().getId()); @@ -67,7 +70,10 @@ public class Oms2cCustomerAddressController extends BaseController return getDataTable(list); } - @JacksonFilter(include= {"id","name","phone","country","province","city","county","address","postCode","email","company","countryName","provinceName","cityName","countyName","town","townName","blDefaultFlag","orderNum","createTime","remark"},value= EmisCustomerAddress.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + @JacksonFilter(include = { "id", "name", "phone", "country", "province", "city", "county", "address", "postCode", + "email", "company", "countryName", "provinceName", "cityName", "countyName", "town", "townName", + "blDefaultFlag", "orderNum", "createTime", "remark", "enterpriseName", + "enterpriseTaxId" }, value = EmisCustomerAddress.class, type = JacksonFilter.JscksonFilterType.RESPONSE) @RequestMapping("/getAddressById") public AjaxResult getAddressById(@RequestParam("id") Long id) { @@ -122,48 +128,62 @@ public class Oms2cCustomerAddressController extends BaseController // @PreAuthorize("@ss.hasPermi('emis:emisCustomerAddress:add')") @Log(title = "客户收寄件地址", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody EmisCustomerAddress emisCustomerAddress) - { - emisCustomerAddress.setUserId(getLoginUser().getUser().getId()); - emisCustomerAddress.setCustomerCode(getLoginUser().getUser().getCustomerCode()); - return toAjax(emisCustomerAddressService.insertEmisCustomerAddress(emisCustomerAddress)); + public AjaxResult add(@RequestBody EmisCustomerAddress emisCustomerAddress) { + try { + emisCustomerAddress.setUserId(getLoginUser().getUser().getId()); + emisCustomerAddress.setCustomerCode(getLoginUser().getUser().getCustomerCode()); + return toAjax(emisCustomerAddressService.insertEmisCustomerAddress(emisCustomerAddress)); + } catch (EmisBizError e) { + return AjaxResult.error(e.getMessage()); + } } @Log(title = "客户收寄件地址", businessType = BusinessType.INSERT) @PostMapping("/addAddress") - public AjaxResult addAddress(@RequestBody EmisCustomerAddress emisCustomerAddress) - { - emisCustomerAddress.setUserId(getLoginUser().getUser().getId()); - emisCustomerAddress.setCustomerCode(getLoginUser().getUser().getCustomerCode()); - return toAjax(emisCustomerAddressService.insertEmisCustomerAddress(emisCustomerAddress)); + public AjaxResult addAddress(@RequestBody EmisCustomerAddress emisCustomerAddress) { + try { + emisCustomerAddress.setUserId(getLoginUser().getUser().getId()); + emisCustomerAddress.setCustomerCode(getLoginUser().getUser().getCustomerCode()); + return toAjax(emisCustomerAddressService.insertEmisCustomerAddress(emisCustomerAddress)); + } catch (EmisBizError e) { + return AjaxResult.error(e.getMessage()); + } } @Log(title = "客户收寄件地址", businessType = BusinessType.UPDATE) @PostMapping("/editAddress") - public AjaxResult editAddress(@RequestBody EmisCustomerAddress emisCustomerAddress) - { - EmisCustomerAddress old=emisCustomerAddressService.selectEmisCustomerAddressById(emisCustomerAddress.getId()); - if(!getLoginUser().getUser().getCustomerCode().equals(old.getCustomerCode())){ - return AjaxResult.error("非法操作"); - } + public AjaxResult editAddress(@RequestBody EmisCustomerAddress emisCustomerAddress) { + try { + EmisCustomerAddress old = emisCustomerAddressService + .selectEmisCustomerAddressById(emisCustomerAddress.getId()); + if (!getLoginUser().getUser().getCustomerCode().equals(old.getCustomerCode())) { + return AjaxResult.error("非法操作"); + } - return toAjax(emisCustomerAddressService.updateEmisCustomerAddress(emisCustomerAddress)); + return toAjax(emisCustomerAddressService.updateEmisCustomerAddress(emisCustomerAddress)); + } catch (EmisBizError e) { + return AjaxResult.error(e.getMessage()); + } } /** * 修改客户收寄件地址 */ -// @PreAuthorize("@ss.hasPermi('emis:emisCustomerAddress:edit')") + // @PreAuthorize("@ss.hasPermi('emis:emisCustomerAddress:edit')") @Log(title = "客户收寄件地址", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody EmisCustomerAddress emisCustomerAddress) - { - EmisCustomerAddress old=emisCustomerAddressService.selectEmisCustomerAddressById(emisCustomerAddress.getId()); - if(!getLoginUser().getUser().getCustomerCode().equals(old.getCustomerCode())){ - return AjaxResult.error("非法操作"); - } + public AjaxResult edit(@RequestBody EmisCustomerAddress emisCustomerAddress) { + try { + EmisCustomerAddress old = emisCustomerAddressService + .selectEmisCustomerAddressById(emisCustomerAddress.getId()); + if (!getLoginUser().getUser().getCustomerCode().equals(old.getCustomerCode())) { + return AjaxResult.error("非法操作"); + } - return toAjax(emisCustomerAddressService.updateEmisCustomerAddress(emisCustomerAddress)); + return toAjax(emisCustomerAddressService.updateEmisCustomerAddress(emisCustomerAddress)); + } catch (EmisBizError e) { + return AjaxResult.error(e.getMessage()); + } } /** diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cMonthpayAccountController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cMonthpayAccountController.java index 129f44b..41c455b 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cMonthpayAccountController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cMonthpayAccountController.java @@ -1,11 +1,11 @@ -/** +/** * @Project: emis * @Title: EmisMonthpayAccountController.java * @author linfso * @date 2024-04-24 05:05:22 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

月结账户表 控制器

*/ @@ -27,11 +27,12 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; /** * 月结账户表Controller - * + * * @author linfso * @date 2024-04-24 05:05:22 */ @@ -52,7 +53,7 @@ public class Oms2cMonthpayAccountController extends BaseController * @param sysOmsUser * @return */ - @JacksonFilter(include= {"custNo","custName","payee","salesmen"},value= SysOmsUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + @JacksonFilter(include= {"custNo","custName","payee","salesmen","params"},value= SysOmsUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @GetMapping("/listSimple") public TableDataInfo listSimple(SysOmsUser sysOmsUser) { @@ -80,6 +81,14 @@ public class Oms2cMonthpayAccountController extends BaseController newUser.setPayeeName(sysOmsUser0.getPayeeName()); newUser.setSalesmen(sysOmsUser0.getSalesmen()); newUser.setSalesmenName(sysOmsUser0.getSalesmenName()); + + // 设置企业名称和企业税号到params中 + if (newUser.getParams() == null) { + newUser.setParams(new HashMap<>()); + } + newUser.getParams().put("enterpriseName", useApply.getEnterpriseName()); + newUser.getParams().put("enterpriseTaxId", useApply.getEnterpriseTaxId()); + list.add(newUser); } } @@ -93,6 +102,22 @@ public class Oms2cMonthpayAccountController extends BaseController newUser.setPayeeName(user.getPayeeName()); newUser.setSalesmen(user.getSalesmen()); newUser.setSalesmenName(user.getSalesmenName()); + + // 设置企业名称和企业税号到params中 + if (newUser.getParams() == null) { + newUser.setParams(new HashMap<>()); + } + // 查询当前用户月结编号对应的企业信息 + EmisMonthpayUseApply currentUserApply = new EmisMonthpayUseApply(); + currentUserApply.setCustNo(user.getMonthlyPayCode()); + List currentUserList = emisMonthpayUseApplyService + .selectEmisMonthpayUseApplyList(currentUserApply); + if (!CollectionUtil.isEmpty(currentUserList)) { + EmisMonthpayUseApply currentApply = currentUserList.get(0); + newUser.getParams().put("enterpriseName", currentApply.getEnterpriseName()); + newUser.getParams().put("enterpriseTaxId", currentApply.getEnterpriseTaxId()); + } + list.add(newUser); } diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisCustomerAddress.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisCustomerAddress.java index a8a7760..d8d508d 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisCustomerAddress.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisCustomerAddress.java @@ -84,4 +84,9 @@ public class EmisCustomerAddress extends BaseEntity /* 使用站点名称 */ private String useSiteName; + /* 企业名称 */ + private String enterpriseName; + /* 企业税号 */ + private String enterpriseTaxId; + } diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisMonthpayUseApply.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisMonthpayUseApply.java index 4ca4220..379a901 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisMonthpayUseApply.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisMonthpayUseApply.java @@ -1,10 +1,10 @@ -/** +/** * @Project: emis * @Title: EmisMonthpayUseApply.java * @author linfso * @date 2024-04-24 05:05:23 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

月结账号使用申请关联 实体类

*/ @@ -53,5 +53,9 @@ public class EmisMonthpayUseApply extends BaseEntity /* 审核验证码 */ private String msgCode; + /* 企业名称 */ + private String enterpriseName; + /* 企业税号 */ + private String enterpriseTaxId; } diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Sender.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Sender.java index 8c39a00..b64ddc8 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Sender.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Sender.java @@ -42,6 +42,10 @@ public class Sender implements Serializable { /* 公司 */ private String company; + /* 企业名称 */ + private String enterpriseName; + /* 企业税号 */ + private String enterpriseTaxId; /* 寄件人客户地址ID */ private Integer id; } diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisCustomerAddressService.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisCustomerAddressService.java index 11efb8e..d56b223 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisCustomerAddressService.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisCustomerAddressService.java @@ -1,35 +1,36 @@ - /** + /** * @Project: emis * @Title: EmisCustomerAddressService.java * @author linfso * @date 2024-03-01 04:47:51 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

客户收寄件地址 服务类接口

*/ package com.xdadan.erp.oms.service; import java.util.List; import com.xdadan.erp.oms.domain.EmisCustomerAddress; +import com.xdadan.erp.oms.domain.exception.EmisBizError; -/** + /** * @ClassName EmisCustomerAddressService * @Description 客户收寄件地址 * @author linfso * @date 2024-03-01 04:47:51 */ -public interface IEmisCustomerAddressService +public interface IEmisCustomerAddressService { /** * 主键查询 * @param id - * @return + * @return */ public EmisCustomerAddress selectEmisCustomerAddressById(Long id); /** * 查询客户收寄件地址列表 - * + * * @param emisCustomerAddress 客户收寄件地址 * @return 客户收寄件地址集合 */ @@ -37,23 +38,23 @@ public interface IEmisCustomerAddressService /** * 新增客户收寄件地址 - * + * * @param emisCustomerAddress 客户收寄件地址 * @return 结果 */ - public int insertEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress); + public int insertEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress) throws EmisBizError; /** * 修改客户收寄件地址 - * + * * @param emisCustomerAddress 客户收寄件地址 * @return 结果 */ - public int updateEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress); + public int updateEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress) throws EmisBizError; /** * 批量删除客户收寄件地址 - * + * * @param ids 需要删除的客户收寄件地址主键集合 * @return 结果 */ @@ -61,7 +62,7 @@ public interface IEmisCustomerAddressService /** * 删除客户收寄件地址信息 - * + * * @param id 客户收寄件地址主键 * @return 结果 */ diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisCustomerAddressServiceImpl.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisCustomerAddressServiceImpl.java index 694b7ca..d5afa32 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisCustomerAddressServiceImpl.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisCustomerAddressServiceImpl.java @@ -1,10 +1,10 @@ - /** + /** * @Project: emis * @Title: EmisCustomerAddressServiceImpl.java * @author linfso * @date 2024-03-01 04:47:51 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

客户收寄件地址 实体类

*/ @@ -17,10 +17,12 @@ import org.springframework.stereotype.Service; import com.xdadan.erp.oms.domain.EmisCustomerAddress; import com.xdadan.erp.oms.mapper.EmisCustomerAddressMapper; import com.xdadan.erp.oms.service.IEmisCustomerAddressService; +import com.xdadan.erp.oms.domain.exception.EmisBizError; +import com.xdadan.erp.oms.domain.enumtype.EmisBizErrorType; /** * 客户收寄件地址Service业务层处理 - * + * * @author linfso * @date 2024-03-01 04:47:51 */ @@ -32,7 +34,7 @@ public class EmisCustomerAddressServiceImpl implements IEmisCustomerAddressServ /** * 查询客户收寄件地址 - * + * * @param id 客户收寄件地址主键 * @return 客户收寄件地址 */ @@ -44,7 +46,7 @@ public class EmisCustomerAddressServiceImpl implements IEmisCustomerAddressServ /** * 查询客户收寄件地址列表 - * + * * @param emisCustomerAddress 客户收寄件地址 * @return 客户收寄件地址 */ @@ -56,13 +58,22 @@ public class EmisCustomerAddressServiceImpl implements IEmisCustomerAddressServ /** * 新增客户收寄件地址 - * + * * @param emisCustomerAddress 客户收寄件地址 * @return 结果 */ @Override - public int insertEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress) - { + public int insertEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress) throws EmisBizError { + // 验证企业名称格式 + if (!validateEnterpriseName(emisCustomerAddress.getEnterpriseName())) { + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "企业名称不能包含空格、回车、@、#、$、%、&、数字等特殊符号"); + } + + // 验证企业税号格式 + if (!validateEnterpriseTaxId(emisCustomerAddress.getEnterpriseTaxId())) { + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "企业税号必须为8-18位数字和大写字母组成，不能包含汉字、空格等特殊符号"); + } + // 新增地址 // emisCustomerAddress.preInsert(); // emisCustomerAddress.setUseSiteCode(getCurrentUser().getOwnerSiteCode()); @@ -72,22 +83,31 @@ public class EmisCustomerAddressServiceImpl implements IEmisCustomerAddressServ /** * 修改客户收寄件地址 - * + * * @param emisCustomerAddress 客户收寄件地址 * @return 结果 */ @Override - public int updateEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress) - { -// emisCustomerAddress.setUseSiteCode(getCurrentUser().getOwnerSiteCode()); -// emisCustomerAddress.setUseSite(getCurrentUser().getOwnerSiteName()); + public int updateEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress) throws EmisBizError { + // 验证企业名称格式 + if (!validateEnterpriseName(emisCustomerAddress.getEnterpriseName())) { + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "企业名称不能包含空格、回车、@、#、$、%、&、数字等特殊符号"); + } + + // 验证企业税号格式 + if (!validateEnterpriseTaxId(emisCustomerAddress.getEnterpriseTaxId())) { + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "企业税号必须为8-18位数字和大写字母组成，不能包含汉字、空格等特殊符号"); + } + + // emisCustomerAddress.setUseSiteCode(getCurrentUser().getOwnerSiteCode()); + // emisCustomerAddress.setUseSite(getCurrentUser().getOwnerSiteName()); return emisCustomerAddressMapper.updateEmisCustomerAddress(emisCustomerAddress); } /** * 批量删除客户收寄件地址 - * + * * @param ids 需要删除的客户收寄件地址主键 * @return 结果 */ @@ -99,7 +119,7 @@ public class EmisCustomerAddressServiceImpl implements IEmisCustomerAddressServ /** * 删除客户收寄件地址信息 - * + * * @param id 客户收寄件地址主键 * @return 结果 */ @@ -149,5 +169,47 @@ public class EmisCustomerAddressServiceImpl implements IEmisCustomerAddressServ return emisCustomerAddressMapper.checkUnique(emisCustomerAddress); } + /** + * 验证企业名称格式 + * 不允许包含空格、回车、@、#、$、%、&、数字等特殊符号 + */ + public boolean validateEnterpriseName(String enterpriseName) { + if (com.xdadan.erp.oms.common.utils.StringUtils.isEmpty(enterpriseName)) { + return true; + } + + // 检查是否包含不允许的字符 + String invalidChars = " @#$%&0123456789"; + for (char c : invalidChars.toCharArray()) { + if (enterpriseName.contains(String.valueOf(c))) { + return false; + } + } + + // 检查是否包含回车符 + if (enterpriseName.contains("\n") || enterpriseName.contains("\r")) { + return false; + } + + return true; + } + + /** + * 验证企业税号格式 + * 8-18位数组成，由数字和大写字母组成，不允许有汉字、空格等特殊符号 + */ + public boolean validateEnterpriseTaxId(String enterpriseTaxId) { + if (com.xdadan.erp.oms.common.utils.StringUtils.isEmpty(enterpriseTaxId)) { + return true; + } + + // 检查长度 + if (enterpriseTaxId.length() < 8 || enterpriseTaxId.length() > 18) { + return false; + } + + // 检查是否只包含数字和大写字母 + return enterpriseTaxId.matches("^[0-9A-Z]+$"); + } } diff --git a/emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml index 0d3dc98..c737689 100644 --- a/emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml +++ b/emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml @@ -27,7 +27,8 @@ - + + @@ -38,7 +39,7 @@ - select id, user_id, customer_code, short_name, alias, address_type, country, name, phone, province, city, county, town, address, post_code, email, company, bl_default_flag, order_num, bl_site_default_flag, use_site, use_site_code, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_customer_address + select id, user_id, customer_code, short_name, alias, address_type, country, name, phone, province, city, county, town, address, post_code, email, company, bl_default_flag, order_num, bl_site_default_flag, use_site, use_site_code, enterprise_name, enterprise_tax_id, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_customer_address @@ -63,6 +64,8 @@ and post_code like concat('%', #{postCode}, '%') and email like concat('%', #{email}, '%') and company like concat('%', #{company}, '%') + and enterprise_name like concat('%', #{enterpriseName}, '%') + and enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%') and bl_default_flag = #{blDefaultFlag} and order_num like concat('%', #{orderNum}, '%') and bl_site_default_flag like concat('%', #{blSiteDefaultFlag}, '%') @@ -87,7 +90,7 @@ @@ -116,6 +119,8 @@ bl_site_default_flag, use_site, use_site_code, + enterprise_name, + enterprise_tax_id, del_flag, create_by, create_time, @@ -147,6 +152,8 @@ #{blSiteDefaultFlag}, #{useSite}, #{useSiteCode}, + #{enterpriseName}, + #{enterpriseTaxId}, #{delFlag}, #{createBy}, #{createTime}, @@ -175,6 +182,8 @@ post_code = #{postCode}, email = #{email}, company = #{company}, + enterprise_name = #{enterpriseName}, + enterprise_tax_id = #{enterpriseTaxId}, where id = #{id} diff --git a/emis-oms-biz/src/main/resources/mapper/EmisMonthpayUseApplyMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisMonthpayUseApplyMapper.xml index 5851ea5..0584950 100644 --- a/emis-oms-biz/src/main/resources/mapper/EmisMonthpayUseApplyMapper.xml +++ b/emis-oms-biz/src/main/resources/mapper/EmisMonthpayUseApplyMapper.xml @@ -16,39 +16,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, cust_no, customer_code, apply_seq, apply_date, apply_name, audit_date, audit_status, audit_reson, audit_by, msg_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_monthpay_use_apply + select a.id, a.cust_no, a.customer_code, a.apply_seq, a.apply_date, a.apply_name, a.audit_date, a.audit_status, a.audit_reson, a.audit_by, a.msg_code, a.remark, a.tenant_id, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.create_site, a.update_site, c.enterprise_name, c.enterprise_tax_id from emis_monthpay_use_apply a left join emis_customer_user c on a.cust_no = c.monthly_pay_code