From 2f8e4234b5e572d2687639bb92a42920f91b8f5c Mon Sep 17 00:00:00 2001 From: lijianlin Date: Sun, 17 Aug 2025 11:55:31 +0800 Subject: [PATCH] =?UTF-8?q?8-17=E9=87=91=E5=B8=81=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=91=98=E5=B7=A5=E5=8F=B7=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java | 1 + src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java | 1 + src/main/resources/mapper/AuditMapper.xml | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java index ec44294..3c009db 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java @@ -55,6 +55,7 @@ public class RechargeAudit { private String auditName; //审核人姓名 private Byte type; //类型 private String rejectReason; //驳回理由 + private Integer flag; //是否为员工号 0员工号 1非员工号 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private String payTime; //支付时间 diff --git a/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java b/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java index 035f6c9..1d04c13 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java @@ -51,6 +51,7 @@ public class RefundAudit { private String auditName; //审核人姓名 private String rejectReason; //驳回理由 private Byte type; //类型 + private Integer flag; //是否为员工号 0-员工号 1-非员工号 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index a235ad9..62fac95 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -58,6 +58,10 @@ left join market m ON u.market = m.id left JOIN rate r ON ugr.rate_id = r.id + + + AND u.flag = 1 + AND ugr.jwcode = #{rechargeAudit.jwcode} @@ -117,6 +121,9 @@ left JOIN rate r ON ugr.rate_id = r.id + + AND u.flag = 1 + AND ugr.jwcode = #{refundAudit.jwcode}