Merge remote-tracking branch 'origin/master'

yaowanxin

昨天 e2aa651db9f17d58819329de571037edc0f9eba2

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

@@ -9,11 +9,16 @@
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.service.ReceiptPaymentService;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

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")
@@ -97,6 +102,21 @@
        return AjaxResult.success(receiptPaymentService.bindInvoiceNoRegPage(page,receiptPaymentDto));
    }

    @ApiModelProperty("导出回款登记")
    @PostMapping("/export")
    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
@@ -132,4 +152,12 @@
    public IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
        return receiptPaymentService.receiptPaymentHistoryListPage(page,receiptPaymentDto);
    }

    /**
     * 查询回款记录不分页
     */
    @GetMapping("/receiptPaymentHistoryListNoPage")
    public List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto) {
        return receiptPaymentService.receiptPaymentHistoryListNoPage(receiptPaymentDto);
    }
}