Browse Source

修改客户账单汇总

master
fanzongzhe 5 months ago
parent
commit
61d89df4a8
  1. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java
  2. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  3. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@ -141,5 +141,5 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
List<CustomerBillSummaryVo> exportCustomerBillExcel( @Param(Constants.WRAPPER) QueryWrapper<FinUncollectedReceivablesDetailed> qw); List<CustomerBillSummaryVo> exportCustomerBillExcel( @Param(Constants.WRAPPER) QueryWrapper<FinUncollectedReceivablesDetailed> qw);
List<CustomerBillSummaryExportVo> selexportCustomerBillExcelDetails(@Param("contractSid") String contractSid); List<CustomerBillSummaryExportVo> selexportCustomerBillExcelDetails(@Param("contractNo") String contractNo);
} }

8
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@ -698,7 +698,7 @@
WHERE WHERE
f.kxState = '01' f.kxState = '01'
GROUP BY GROUP BY
f.contractSid f.contractNo
) AS a ) AS a
) b ) b
<where> <where>
@ -932,7 +932,7 @@
WHERE WHERE
f.kxState = '01' f.kxState = '01'
GROUP BY GROUP BY
f.contractSid f.contractNo
) AS a ) AS a
) b ) b
<where> <where>
@ -958,7 +958,7 @@
LEFT JOIN fin_uncollected_receivables_detailed as fd ON d.receivablesSid = fd.sid LEFT JOIN fin_uncollected_receivables_detailed as fd ON d.receivablesSid = fd.sid
LEFT JOIN anrui_buscenter.bus_sales_order_vehicle as v ON fd.busVinSid = v.sid LEFT JOIN anrui_buscenter.bus_sales_order_vehicle as v ON fd.busVinSid = v.sid
WHERE WHERE
d.contractSid = #{contractSid} d.contractNo = #{contractNo}
AND d.auditState = 3 AND d.auditState = 3
UNION ALL UNION ALL
SELECT SELECT
@ -995,7 +995,7 @@
LEFT JOIN anrui_buscenter.bus_sales_order_vehicle as v ON fd.busVinSid = v.sid LEFT JOIN anrui_buscenter.bus_sales_order_vehicle as v ON fd.busVinSid = v.sid
WHERE WHERE
d.auditState = 3 d.auditState = 3
AND d.contractSid = #{contractSid} AND d.contractNo = #{contractNo}
) AS m ) AS m
WHERE WHERE
m.collectionMoney != 0 m.collectionMoney != 0

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@ -1370,8 +1370,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
List<CustomerBillSummaryVo> summaryVos = baseMapper.exportCustomerBillExcel(qw); List<CustomerBillSummaryVo> summaryVos = baseMapper.exportCustomerBillExcel(qw);
if (!summaryVos.isEmpty()) { if (!summaryVos.isEmpty()) {
for (CustomerBillSummaryVo summaryVo : summaryVos) { for (CustomerBillSummaryVo summaryVo : summaryVos) {
String contractSid = summaryVo.getContractSid(); String contractNo = summaryVo.getContractNo();
List<CustomerBillSummaryExportVo> details = baseMapper.selexportCustomerBillExcelDetails(contractSid); List<CustomerBillSummaryExportVo> details = baseMapper.selexportCustomerBillExcelDetails(contractNo);
if (!details.isEmpty()) { if (!details.isEmpty()) {
list.addAll(details); list.addAll(details);
} }

Loading…
Cancel
Save