From 9917a1233541f8ae8494aed4297b5459e025c6fd Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 13 Nov 2024 17:11:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerBillSummaryExportVo.java | 18 +++-- ...nUncollectedReceivablesDetailedMapper.java | 4 +- ...inUncollectedReceivablesDetailedMapper.xml | 69 +++++++++++++++++-- ...UncollectedReceivablesDetailedService.java | 26 +++++-- 4 files changed, 100 insertions(+), 17 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryExportVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryExportVo.java index b6d6685b46..b0bb834797 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryExportVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/CustomerBillSummaryExportVo.java @@ -20,13 +20,21 @@ public class CustomerBillSummaryExportVo { @ApiModelProperty("合同编号") @ExportEntityMap(CnName = "合同编号", EnName = "contractNo") private String contractNo; // 合同编号 + @ExportEntityMap(CnName = "车架号", EnName = "vinNo") + private String vinNo; // 车架号 + @ExportEntityMap(CnName = "款项名称", EnName = "receivablesName") + private String receivablesName; // 款项名称 + @ExportEntityMap(CnName = "应收款项状态", EnName = "kxState") + private String kxState; // 应收款项状态 01正常，02作废 @ApiModelProperty("应收金额") @ExportEntityMap(CnName = "应收金额", EnName = "reveivableMoney") private String reveivableMoney; // 当前应收金额 - @ApiModelProperty("实收金额") - @ExportEntityMap(CnName = "实收金额", EnName = "subscriptionMoney") + @ExportEntityMap(CnName = "收款日期", EnName = "collectionDate") + private String collectionDate; + @ExportEntityMap(CnName = "收款金额", EnName = "subscriptionMoney") private String subscriptionMoney; // 认款金额 - @ApiModelProperty("未认款金额") - @ExportEntityMap(CnName = "未认款金额", EnName = "noSubscriptionMoney") - private String noSubscriptionMoney; // 未认款金额 + @ExportEntityMap(CnName = "付款方式", EnName = "collectionTypeValue") + private String collectionTypeValue; + @ExportEntityMap(CnName = "单据编号", EnName = "billNo") + private String billNo; // 单据编号 } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index 41c2cf596e..93c19e65a6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -139,5 +139,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper selCustomerThreeListDetails(@Param("receivablesSid") String receivablesSid); - List exportCustomerBillExcel( @Param(Constants.WRAPPER) QueryWrapper qw); + List exportCustomerBillExcel( @Param(Constants.WRAPPER) QueryWrapper qw); + + List selexportCustomerBillExcelDetails(@Param("contractSid") String contractSid); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index bdd63a9f55..457fb9cc01 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -881,9 +881,8 @@ m.collectionMoney != 0 + diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index c21a4ed56c..3aa67c55fa 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -1284,10 +1284,10 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService qw.apply("( b.reveivableMoney - b.subscriptionMoney ) <=" + query.getNoSubscriptionMoneyEnd()); } if (StringUtils.isNotBlank(query.getContractNo())) { - qw.like("b.contractNo",query.getContractNo()); + qw.like("b.contractNo", query.getContractNo()); } if (StringUtils.isNotBlank(query.getCustomerName())) { - qw.like("b.customerName",query.getCustomerName()); + qw.like("b.customerName", query.getCustomerName()); } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.getCustomerSummaryList(page, qw); @@ -1316,6 +1316,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService public List exportCustomerBillExcel(CustomerBillSummaryQuery query) { QueryWrapper qw = new QueryWrapper<>(); String orgPath = query.getOrgPath(); + List list = new ArrayList<>(); //授权 if (StringUtils.isNotBlank(query.getMenuUrl())) { PrivilegeQuery privilegeQuery = new PrivilegeQuery(); @@ -1361,12 +1362,27 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService qw.apply("( b.reveivableMoney - b.subscriptionMoney ) <=" + query.getNoSubscriptionMoneyEnd()); } if (StringUtils.isNotBlank(query.getContractNo())) { - qw.like("b.contractNo",query.getContractNo()); + qw.like("b.contractNo", query.getContractNo()); } if (StringUtils.isNotBlank(query.getCustomerName())) { - qw.like("b.customerName",query.getCustomerName()); + qw.like("b.customerName", query.getCustomerName()); + } + List summaryVos = baseMapper.exportCustomerBillExcel(qw); + if (!summaryVos.isEmpty()) { + for (CustomerBillSummaryVo summaryVo : summaryVos) { + String contractSid = summaryVo.getContractSid(); + List details = baseMapper.selexportCustomerBillExcelDetails(contractSid); + if (!details.isEmpty()) { + list.addAll(details); + } + } + } + if (!list.isEmpty()) { + for (int i = 0; i < list.size(); i++) { + CustomerBillSummaryExportVo exportVo = list.get(i); + exportVo.setRankNo(i + 1); + } } - List list = baseMapper.exportCustomerBillExcel(qw); return list; } }