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 48f3676..7e7baae 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 @@ -70,6 +70,8 @@ public class FundsDTO { @ExcelIgnore private Integer status; + @ExcelIgnore + private String submitter; private String statusName; @ExcelIgnore private List statuses; diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index dff25d6..ab72720 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -473,6 +473,7 @@ crc.received_time, crc.voucher, crc.status, + a.admin_name as submitter, NULL as refundCurrency, NULL as refundAmount, NULL as relatedId, @@ -481,6 +482,7 @@ left join recharge_activity ra on ra.id = crc.activity LEFT JOIN market m1 ON m1.id = crc.performance_market LEFT JOIN market m2 ON m2.id = crc.received_market + left join admin a on a.id = crc.submitter_id WHERE 1=1 and crc.jwcode = #{jwcode} @@ -559,6 +561,7 @@ crc.received_time, crc.voucher, crc.status, + a.admin_name as submitter, crr.refund_currency as refundCurrency, ROUND(crr.refund_amount / 100.0, 2) as refundAmount, crr.related_id as relatedId, @@ -568,6 +571,7 @@ left join recharge_activity ra on ra.id = crc.activity LEFT JOIN market m1 ON m1.id = crc.performance_market LEFT JOIN market m2 ON m2.id = crc.received_market + left join admin a on a.id = crc.submitter_id WHERE crr.status =41 and crc.jwcode = #{jwcode}