From d24d060892415caeeead78c9dddd45ab3d81e3c7 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 11 十月 2024 14:25:36 +0800
Subject: [PATCH] 实现接口 指定时间段内用水量低于指定值的农户         指定时间段内消费金额低于指定值的农户         指定时间段内用水时长低于指定值的农户

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
index 977aa19..aac929f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
@@ -140,7 +140,9 @@
     SELECT
       DISTINCT Date(ope.operate_dt) AS operateDate
     FROM se_card_operate ope
-    WHERE Date(ope.operate_dt) NOT IN(SELECT operate_date FROM se_general) AND Date(ope.operate_dt) != CURDATE()
+    WHERE Date(ope.operate_dt) NOT IN(SELECT operate_date FROM se_general)
+<!--      鍙栨秷褰撳ぉ闄愬埗-->
+<!--      AND Date(ope.operate_dt) != CURDATE()-->
   </select>
 
   <!--鏍规嵁浜ゆ槗鏃ユ湡鑾峰彇鎬昏处璁板綍鍒楄〃锛堝緟鐢熸垚鐨勶級  -->
@@ -216,7 +218,7 @@
         trade_amount AS tradeAmount,
         gift,
         refund_amount AS refundAmount,
-        (trade_amount + gift + refund_amount) AS totalAmount,
+        (trade_amount + gift - refund_amount) AS totalAmount,
         Date(operate_date) AS operateDate,
         (CASE
           WHEN audit_status = 1 THEN '鏈鏍�'

--
Gitblit v1.8.0