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/fee/FeeDetailServiceDaoImplMapper.xml | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
index 9635c24..3c9866c 100755
--- a/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml
@@ -121,7 +121,8 @@
t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime,pfa.`value`
importFeeName,pfc.fee_name feeName,t.payable_amount,t.payable_amount payableAmount,
mw.cur_degrees curDegrees,mw.pre_degrees preDegrees, mw.pre_reading_time preReadingTime,mw.cur_reading_time
- curReadingTime,t.pay_order_id payOrderId,pfc.config_id configId,td.`name` primeRateName,pfao1.`value` payerObjName
+ curReadingTime,t.pay_order_id payOrderId,pfc.config_id configId,td.`name` primeRateName,pfao1.`value` payerObjName,
+ t.cashier_id cashierId,t.cashier_name cashierName
from pay_fee_detail t
left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
@@ -191,6 +192,12 @@
</if>
<if test="state !=null and state != ''">
and t.state= #{state}
+ </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 ">
@@ -300,6 +307,12 @@
<if test="endTime !=null ">
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>
<if test="curYear != null and curYear != ''">
and DATE_FORMAT(DATE_SUB(t.end_time,INTERVAL 1 DAY),'%Y') = #{curYear}
</if>
--
Gitblit v1.8.0