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/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/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