fix(营销): 回款流水导出全空(copyBeanProp参数顺序反了+字段名不匹配)、开票台账SQL漏字段invoice_registration...

tuqin

9 天以前 18e1abc0c5623137e9689d4bd30701d946e4cd88

fix(营销): 回款流水导出全空(copyBeanProp参数顺序反了+字段名不匹配)、开票台账SQL漏字段invoice_registration_product_id/invoice_total

 src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java

@@ -22,8 +22,10 @@

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@@ -174,7 +176,17 @@
        List<ReceiptPaymentRecordDto> receiptPaymentRecordDtos = new ArrayList<>();
        salesLedgerIPage.getRecords().forEach(receiptPaymentRecordDto -> {
            ReceiptPaymentRecordDto receiptPaymentRecordDto1 = new ReceiptPaymentRecordDto();
            BeanUtils.copyBeanProp(receiptPaymentRecordDto, receiptPaymentRecordDto1);
            // copyBeanProp(Object dest, Object src)：第一个参数是目标，第二个是源
            BeanUtils.copyBeanProp(receiptPaymentRecordDto1, receiptPaymentRecordDto);
            // 字段名不一致的手动补齐
            receiptPaymentRecordDto1.setReceiptPaymentAmountTotal(receiptPaymentRecordDto.getReceiptPaymentAmount());
            if (receiptPaymentRecordDto1.getReceiptPaymentType() == null) {
                receiptPaymentRecordDto1.setReceiptPaymentType(receiptPaymentRecordDto.getReceiptPaymentType());
            }
            if (receiptPaymentRecordDto.getCreateTime() != null) {
                receiptPaymentRecordDto1.setInvoiceDate(Date.from(
                        receiptPaymentRecordDto.getCreateTime().atZone(ZoneId.systemDefault()).toInstant()));
            }
            receiptPaymentRecordDtos.add(receiptPaymentRecordDto1);
        });
        util.exportExcel(response, receiptPaymentRecordDtos, "回款流水列表");

 src/main/resources/mapper/sales/InvoiceLedgerMapper.xml

@@ -19,6 +19,8 @@
            T1.update_time       ,
            T1.update_user       ,
            T1.tenant_id         ,
            T1.invoice_registration_product_id,
            T1.invoice_total,
            T2.customer_name,
            T3.customer_contract_no,
            T3.salesman,
@@ -61,6 +63,8 @@
            T1.update_time       ,
            T1.update_user       ,
            T1.tenant_id         ,
            T1.invoice_registration_product_id,
            T1.invoice_total,
            T2.customer_name,
            T3.salesman,
            T3.customer_contract_no,
@@ -103,6 +107,8 @@
        T1.update_time       ,
        T1.update_user       ,
        T1.tenant_id         ,
            T1.invoice_registration_product_id,
            T1.invoice_total,
        T2.customer_name
        FROM invoice_ledger T1
        LEFT JOIN customer T2 ON T1.customer_id = T2.id
@@ -153,6 +159,8 @@
            T1.update_time               ,
            T1.update_user               ,
            T1.tenant_id,
            T1.invoice_registration_product_id,
            T1.invoice_total,
            T2.sales_contract_no,
            T2.customer_contract_no,
            T2.customer_name,