diff --git a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java index 8ba02ec..295f683 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java @@ -71,4 +71,6 @@ public class FundsDTO { private String sortField; @ExcelIgnore private String sortOrder; + @ExcelIgnore + private List localMarket; } diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index 100f3a2..a214a69 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -172,6 +172,9 @@ crc.pay_time, crc.voucher, crc.remark, + crr.refund_reason, + crr.refund_remark, + crr.reject_reason, crc.payment_currency, crc.payment_amount from cash_record_refund crr @@ -450,6 +453,9 @@ #{markets} + + and crc.market = #{localMarket} + and crc.`pay_time` BETWEEN #{startTime} AND #{endTime}