bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报表

This commit is contained in:
gaowdong 2025-04-24 14:39:59 +08:00
parent a293017a3b
commit d96ce38b1c
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/DeptIncomeOutcomeVO.java
View File

@ -10,6 +10,7 @@ import java.time.LocalDateTime;
public class DeptIncomeOutcomeVO implements Serializable { public class DeptIncomeOutcomeVO implements Serializable {
private Long deptId; private Long deptId;
private String deptName; private String deptName;
private String deptFullName;
private BigDecimal walletBal; private BigDecimal walletBal;
private BigDecimal income; private BigDecimal income;
private BigDecimal outcome; private BigDecimal outcome;

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/domain/UserIncomeOutcomeVO.java
View File

@ -11,6 +11,7 @@ public class UserIncomeOutcomeVO implements Serializable {
private String phonenumber; private String phonenumber;
private Long deptId; private Long deptId;
private String deptName; private String deptName;
private String deptFullName;
private String nickName; private String nickName;
private BigDecimal walletBal; private BigDecimal walletBal;
private BigDecimal walletBalNow; private BigDecimal walletBalNow;

6
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/AccReportMapper.xml
View File

@ -53,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT SELECT
c.dept_id, c.dept_id,
c.dept_name, c.dept_name,
c.dept_full_name,
c.wallet_bal_dept as wallet_bal, c.wallet_bal_dept as wallet_bal,
b.income, b.income,
b.outcome, b.outcome,
@ -95,7 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select select
IFNULL(sum(a.wallet_bal), 0) as wallet_bal_dept , IFNULL(sum(a.wallet_bal), 0) as wallet_bal_dept ,
su.dept_id, su.dept_id,
sd.dept_name sd.dept_name,
sd.dept_full_name
from from
( (
select select
@ -144,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
su.phonenumber, su.phonenumber,
sd.dept_id, sd.dept_id,
sd.dept_name, sd.dept_name,
sd.dept_full_name,
SUM(IFNULL(CASE SUM(IFNULL(CASE
WHEN at2.trade_type in (10, 20, 130) then WHEN at2.trade_type in (10, 20, 130) then
at2.actual_amount at2.actual_amount
@ -188,6 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_user su on left join sys_user su on
a.user_id = su.user_id a.user_id = su.user_id
where where
1 = 1
<if test="param.deptIdList != null and param.deptIdList.size() > 0"> <if test="param.deptIdList != null and param.deptIdList.size() > 0">
and su.dept_id in and su.dept_id in
<foreach collection="param.deptIdList" item="deptId" separator="," open="(" close=")"> <foreach collection="param.deptIdList" item="deptId" separator="," open="(" close=")">