Browse Source

04-17 资金流水账添加提交人姓名

dev
lijianlin 4 days ago
parent
commit
e6b1ad9701
  1. 2
      src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java
  2. 4
      src/main/resources/cashMapper/CashRefundMapper.xml

2
src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java

@ -70,6 +70,8 @@ public class FundsDTO {
@ExcelIgnore @ExcelIgnore
private Integer status; private Integer status;
@ExcelIgnore
private String submitter;
private String statusName; private String statusName;
@ExcelIgnore @ExcelIgnore
private List<Integer> statuses; private List<Integer> statuses;

4
src/main/resources/cashMapper/CashRefundMapper.xml

@ -473,6 +473,7 @@
crc.received_time, crc.received_time,
crc.voucher, crc.voucher,
crc.status, crc.status,
a.admin_name as submitter,
NULL as refundCurrency, NULL as refundCurrency,
NULL as refundAmount, NULL as refundAmount,
NULL as relatedId, NULL as relatedId,
@ -481,6 +482,7 @@
left join recharge_activity ra on ra.id = crc.activity left join recharge_activity ra on ra.id = crc.activity
LEFT JOIN market m1 ON m1.id = crc.performance_market LEFT JOIN market m1 ON m1.id = crc.performance_market
LEFT JOIN market m2 ON m2.id = crc.received_market LEFT JOIN market m2 ON m2.id = crc.received_market
left join admin a on a.id = crc.submitter_id
WHERE 1=1 WHERE 1=1
<if test="jwcode != null"> <if test="jwcode != null">
and crc.jwcode = #{jwcode} and crc.jwcode = #{jwcode}
@ -559,6 +561,7 @@
crc.received_time, crc.received_time,
crc.voucher, crc.voucher,
crc.status, crc.status,
a.admin_name as submitter,
crr.refund_currency as refundCurrency, crr.refund_currency as refundCurrency,
ROUND(crr.refund_amount / 100.0, 2) as refundAmount, ROUND(crr.refund_amount / 100.0, 2) as refundAmount,
crr.related_id as relatedId, crr.related_id as relatedId,
@ -568,6 +571,7 @@
left join recharge_activity ra on ra.id = crc.activity left join recharge_activity ra on ra.id = crc.activity
LEFT JOIN market m1 ON m1.id = crc.performance_market LEFT JOIN market m1 ON m1.id = crc.performance_market
LEFT JOIN market m2 ON m2.id = crc.received_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 WHERE crr.status =41
<if test="jwcode != null"> <if test="jwcode != null">
and crc.jwcode = #{jwcode} and crc.jwcode = #{jwcode}

Loading…
Cancel
Save