From b6949a31464f2ca4e790affd467dcfc511223ba2 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 四月 2023 23:56:00 +0800
Subject: [PATCH] 优化交费 -- 加入收银员功能
---
java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
index 42f92a4..c0c1243 100755
--- a/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml
@@ -1724,6 +1724,12 @@
<if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
+ <if test="cashierId !=null and cashierId != ''">
+ and t.cashier_id= #{cashierId}
+ </if>
+ <if test="cashierName !=null and cashierName != ''">
+ and t.cashier_name= #{cashierName}
+ </if>
) t
</select>
@@ -1737,7 +1743,7 @@
ruleName,pfdd.discount_price discountPrice,co.contract_code contractCode,pfo.`value` ownerName,cb.o_id oId,
d2.name feeTypeCdName,pfc.fee_type_cd feeTypeCd,t.state,d3.name stateName,t.fee_id feeId,pft.`value` repairId,
t.detail_id,t.detail_id detailId,pf.payer_obj_id,pfb.value ownerId,concat(pa.num,'鍋滆溅鍦�',ps.num,'杞︿綅') psName,
- fad.amount withholdAmount
+ fad.amount withholdAmount,t.cashier_id cashierId,t.cashier_name cashierName
from pay_fee_detail t
left JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
@@ -1819,6 +1825,12 @@
<if test="endTime !=null and endTime != ''">
and t.create_time <= #{endTime}
</if>
+ <if test="cashierId !=null and cashierId != ''">
+ and t.cashier_id= #{cashierId}
+ </if>
+ <if test="cashierName !=null and cashierName != ''">
+ and t.cashier_name= #{cashierName}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
--
Gitblit v1.8.0