From e6b1ad9701f2ac3ede2c16b294066a0d813723cb Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 17 Apr 2026 19:03:39 +0800 Subject: [PATCH] =?UTF-8?q?04-17=20=E8=B5=84=E9=87=91=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E8=B4=A6=E6=B7=BB=E5=8A=A0=E6=8F=90=E4=BA=A4=E4=BA=BA=E5=A7=93?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java | 2 ++ src/main/resources/cashMapper/CashRefundMapper.xml | 4 ++++ 2 files changed, 6 insertions(+) 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}