Merge remote-tracking branch 'origin/sqd' into sqd

maven

2 天以前 83a2ac0bbf44d550a4d0add970d14623298a8574

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

@@ -18,12 +18,17 @@
import com.ruoyi.sales.service.ReceiptPaymentService;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;

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

@@ -160,6 +165,7 @@
        return receiptPaymentService.receiptPaymentHistoryListPage(page,receiptPaymentDto);
    }

    private static final ZoneId DEFAULT_ZONE_ID = ZoneId.systemDefault();
    /**
     * 导出回款流水列表
     */
@@ -174,10 +180,12 @@
        List<ReceiptPaymentRecordDto> receiptPaymentRecordDtos = new ArrayList<>();
        salesLedgerIPage.getRecords().forEach(receiptPaymentRecordDto -> {
            ReceiptPaymentRecordDto receiptPaymentRecordDto1 = new ReceiptPaymentRecordDto();
            BeanUtils.copyBeanProp(receiptPaymentRecordDto, receiptPaymentRecordDto1);
            BeanUtils.copyProperties(receiptPaymentRecordDto, receiptPaymentRecordDto1);
            receiptPaymentRecordDto1.setInvoiceDate(Date.from(receiptPaymentRecordDto.getCreateTime().atZone(DEFAULT_ZONE_ID).toInstant()));
            receiptPaymentRecordDto1.setReceiptPaymentAmountTotal(receiptPaymentRecordDto.getReceiptPaymentAmount());
            receiptPaymentRecordDtos.add(receiptPaymentRecordDto1);
        });
        util.exportExcel(response, receiptPaymentRecordDtos, "导出开票登记列表");
        util.exportExcel(response, receiptPaymentRecordDtos, "导出回款流水列表");
    }

    /**