From d96ce38b1cf1550ad6d57e42fbe890e2b2f8ba70 Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Thu, 24 Apr 2025 14:39:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/core/report/domain/DeptIncomeOutcomeVO.java     | 1 +
 .../canteen/core/report/domain/UserIncomeOutcomeVO.java     | 1 +
 .../src/main/resources/mapper/report/AccReportMapper.xml    | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeVO.java
index 3b27c5c..0bceb8c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeVO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeVO.java
@@ -10,6 +10,7 @@ import java.time.LocalDateTime;
 public class DeptIncomeOutcomeVO implements Serializable {
     private Long deptId;
     private String deptName;
+    private String deptFullName;
     private BigDecimal walletBal;
     private BigDecimal income;
     private BigDecimal outcome;
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeVO.java
index d58af30..d6b5e83 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeVO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeVO.java
@@ -11,6 +11,7 @@ public class UserIncomeOutcomeVO implements Serializable {
     private String phonenumber;
     private Long deptId;
     private String deptName;
+    private String deptFullName;
     private String nickName;
     private BigDecimal walletBal;
     private BigDecimal walletBalNow;
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml
index cc6644b..d03b131 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml
@@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         c.dept_id,
         c.dept_name,
+        c.dept_full_name,
         c.wallet_bal_dept as wallet_bal,
         b.income,
         b.outcome,
@@ -95,7 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
         IFNULL(sum(a.wallet_bal), 0) as wallet_bal_dept ,
         su.dept_id,
-        sd.dept_name
+        sd.dept_name,
+        sd.dept_full_name
         from
         (
         select
@@ -144,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         su.phonenumber,
         sd.dept_id,
         sd.dept_name,
+        sd.dept_full_name,
         SUM(IFNULL(CASE
         WHEN at2.trade_type in (10, 20, 130) then
         at2.actual_amount
@@ -188,6 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_user su on
         a.user_id = su.user_id
         where
+        1 = 1
         <if test="param.deptIdList != null and param.deptIdList.size() > 0">
             and su.dept_id in
             <foreach collection="param.deptIdList" item="deptId" separator="," open="(" close=")">