Merge remote-tracking branch 'origin/master'

yaowanxin

昨天 e2aa651db9f17d58819329de571037edc0f9eba2

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

@@ -16,7 +16,9 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

@RestController
@RequestMapping("/receiptPayment")
@@ -102,14 +104,19 @@

    @ApiModelProperty("导出回款登记")
    @PostMapping("/export")
    public void export(HttpServletResponse response, ArrayList<Long> ids) {
        //ids选择就是全导出
//        if (ids == null || ids.size() == 0) {
//            receiptPaymentService.exportPaymentList(response);
//        }
            receiptPaymentService.exportPaymentList(response, ids);
    public void export(HttpServletResponse response, String ids) {
        if (ids == null || ids.isEmpty()) {
            receiptPaymentService.exportPaymentList(response, null);
        } else {
            ArrayList<Long> idList = (ArrayList<Long>) Arrays.stream(ids.split(","))
                    .map(s -> s.replaceAll("[\\[\\]]", "").trim())
                    .map(Long::valueOf)
                    .collect(Collectors.toList());
            receiptPaymentService.exportPaymentList(response, idList);
        }
    }


    /**
     * 开票台账详情
     * @param id