From 77547e85cac1f2e9a02e770fb8dfb603d236c67a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 十二月 2024 11:50:36 +0800
Subject: [PATCH] 1、取水口年月水量统计、农户年月用水量统计、取水口漏损年月统计存在bug，进行了修改； 2、生成新的pipIrr-web-temp临时任务模块，执行一些临时任务，例如删除数据库中一些出错的数据。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 6ddb1e5..cf15a1f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -251,7 +251,7 @@
LEFT 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(1, 2, 5)
+ AND ope.operate_type in(1, 2, 5,10)
AND ope.operate_valid = 2
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
@@ -300,6 +300,7 @@
WHEN ope.operate_type = 1 THEN '寮�鍗�'
WHEN ope.operate_type = 2 THEN '鍏呭��'
WHEN ope.operate_type = 5 THEN '杩旇繕'
+ WHEN ope.operate_type = 10 THEN '鍙嶅啓'
END) AS operateType,
ope.operate_dt
FROM se_card_operate ope
@@ -309,7 +310,7 @@
LEFT 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(1, 2, 5)
+ AND ope.operate_type in(1, 2, 5,10)
AND ope.operate_valid = 2
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
@@ -336,12 +337,12 @@
SELECT
COUNT(*) AS recordCount
FROM se_card_operate ope
- INNER JOIN se_client cli ON ope.client_id = cli.id
- INNER JOIN se_client_card card ON card.id = ope.card_id
- LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id
- INNER JOIN ba_user us ON ope.operator = us.id
+ LEFT JOIN se_client cli ON ope.client_id = cli.id
+ LEFT JOIN se_client_card card ON card.id = ope.card_id
+ LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id
+ LEFT JOIN ba_user us ON ope.operator = us.id
<where>
- AND ope.operate_type IN(1,2,3,5)
+ AND ope.operate_type IN(1,2,3,5,10)
AND ope.operate_valid = 2
<if test = "villageId != null and villageId > 0">
AND cli.villageId = #{villageId}
@@ -371,6 +372,7 @@
WHEN 2 THEN '鍏呭��'
WHEN 3 THEN '閿�鍗�'
WHEN 5 THEN '琛ユ墸'
+ WHEN 10 THEN '鍙嶅啓'
END) AS operateType,
(IFNULL(ope.trade_amount,0.00) + IFNULL(ope.card_cost,0.00)) AS tradeAmount,
IFNULL(ope.trade_amount,0.00) AS waterCost,
@@ -395,7 +397,7 @@
LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id
LEFT JOIN ba_user us ON ope.operator = us.id
<where>
- AND ope.operate_type IN(1,2,3,5)
+ AND ope.operate_type IN(1,2,3,5,10)
AND ope.operate_valid = 2
<if test = "villageId != null and villageId > 0">
AND cli.villageId = #{villageId}
--
Gitblit v1.8.0