From c60767599cf741fde1cb7a10544d8c0ebb8db6a5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 八月 2024 19:36:33 +0800
Subject: [PATCH] 2024-08-08 朱宝民 统计指定月份各天漏算了、统计指定年份各月漏算量
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
index 19345e8..8baa1e8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -235,12 +235,12 @@
select
COUNT(*) AS recordCount
FROM se_card_operate ope
- INNER JOIN se_client_card card ON ope.card_id = card.id
- INNER JOIN se_client cli ON ope.client_id = cli.id
- INNER JOIN ba_user us ON ope.operator = us.id
- Left JOIN se_payment_method pay ON ope.payment_id = pay.id
+ INNER JOIN se_client_card card ON ope.card_id = card.id
+ INNER JOIN se_client cli ON ope.client_id = cli.id
+ INNER JOIN ba_user us ON ope.operator = us.id
+ Left JOIN se_payment_method pay ON ope.payment_id = pay.id
<where>
- AND ope.operate_type in(2, 5)
+ AND ope.operate_type in(1, 2, 5)
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
@@ -253,13 +253,13 @@
AND card.cardNum like CONCAT('%',#{cardNum},'%')
</if>
-<!-- <if test = "paymentId != null and paymentId > 0">-->
-<!-- AND ope.payment_id = ${paymentId}-->
-<!-- </if>-->
+ <!-- <if test = "paymentId != null and paymentId > 0">-->
+ <!-- AND ope.payment_id = ${paymentId}-->
+ <!-- </if>-->
-<!-- <if test = "rechargeTimeStart != null and rechargeTimeStop != null">-->
-<!-- AND ope.operate_dt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}-->
-<!-- </if>-->
+ <!-- <if test = "rechargeTimeStart != null and rechargeTimeStop != null">-->
+ <!-- AND ope.operate_dt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}-->
+ <!-- </if>-->
</where>
</select>
@@ -274,11 +274,12 @@
cli.clientNum,
cli.address,
card.money,
- CASE
- WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))
- ELSE card.cardNum
- END AS cardNum,
- ope2.card_cost AS cardCost,
+ cardNum,
+<!-- CASE-->
+<!-- WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))-->
+<!-- ELSE card.cardNum-->
+<!-- END AS cardNum,-->
+ IFNULL(ope.card_cost,0) AS cardCost,
IFNULL(ope.trade_amount, 0) AS amount,
IFNULL(ope.refund_amount, 0) AS refundAmount,
(IFNULL(ope.money, 0) + IFNULL(ope.trade_amount, 0)) AS afterRecharge,
@@ -286,19 +287,18 @@
ope.price,
us.name AS opr,
(CASE
- WHEN ope.operate_type = 2 THEN "鍏呭��"
- WHEN ope.operate_type = 5 THEN "杩旇繕"
+ WHEN ope.operate_type = 1 THEN "寮�鍗�"
+ WHEN ope.operate_type = 2 THEN "鍏呭��"
+ WHEN ope.operate_type = 5 THEN "杩旇繕"
END) AS operateType,
ope.operate_dt
FROM se_card_operate ope
- INNER JOIN se_client_card card ON ope.card_id = card.id
- INNER JOIN se_client cli ON ope.client_id = cli.id
- INNER JOIN ba_user us ON ope.operator = us.id
- INNER JOIN se_card_operate ope2 ON ope2.card_id = ope.card_id
- Left JOIN se_payment_method pay ON ope.payment_id = pay.id
+ INNER JOIN se_client_card card ON ope.card_id = card.id
+ INNER JOIN se_client cli ON ope.client_id = cli.id
+ INNER JOIN ba_user us ON ope.operator = us.id
+ Left JOIN se_payment_method pay ON ope.payment_id = pay.id
<where>
- AND ope.operate_type in(2, 5)
- AND ope2.operate_type = 1
+ AND ope.operate_type in(1, 2, 5)
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
@@ -690,5 +690,7 @@
AND ope.operate_type = 6
AND card.cardNum = #{cardNum}
</where>
+ ORDER BY ope.operate_dt DESC
+ LIMIT 0,1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0