From b4c6816d3016e26d908c55d3a194d972b998e952 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 08 一月 2025 14:42:30 +0800
Subject: [PATCH] 优化接口 水卡使用情况（充值、消费、余额）
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java | 87 +++++++++++++++++++++++++++----------------
1 files changed, 55 insertions(+), 32 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
index 98a7e5f..613d661 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrStatistics.intake;
+import com.dy.common.util.DateTime;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.*;
import com.dy.pipIrrGlobal.voSt.*;
@@ -94,7 +95,7 @@
return rsVo ;
}
- /**
+ /** ok 1
* 鑾峰彇绱娴侀噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
* @param qo
* @return
@@ -116,7 +117,7 @@
return rsVo ;
}
- /**
+ /** ok 2
* 鑾峰彇绱娴侀噺浣庝簬鎸囧畾鍊肩殑鍙栨按鍙�
* @param qo
* @return
@@ -476,7 +477,7 @@
return rsVo ;
}
- /**
+ /** ok 3
* 鎸囧畾鏃堕棿娈靛唴鐢ㄦ按閲忚秴杩囨寚瀹氬�肩殑鍙栨按鍙�
* @param qo
* @return
@@ -484,37 +485,31 @@
public QueryResultVo<List<VoIntakeAccumulateAmount>> getUseWaterGtValueIntakes(IntakeAmountValueQO qo) {
String timeStart = qo.getTimeStart();
String timeStop = qo.getTimeStop();
- if(timeStart != null && timeStart != "") {
- timeStart = timeStart + " 00:00:00";
- } else {
- timeStart = LocalDate.now() + " 00:00:00";
+ if(timeStart == null || timeStart.trim().equals("")) {
+ timeStart = DateTime.yyyy_MM_dd() ;
+ qo.setTimeStart(timeStart);
}
- qo.setTimeStart(timeStart);
-
- if(timeStop != null && timeStop != "") {
- timeStop = timeStop + " 23:59:59";
- }else {
- timeStop = LocalDate.now() + " 23:59:59";
+ if(timeStop == null || timeStop.trim().equals("")) {
+ timeStop = DateTime.yyyy_MM_dd() ;
+ qo.setTimeStop(timeStop);
}
- qo.setTimeStop(timeStop);
-
if (qo.getValue() == null){
qo.setValue(0.0);
}
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
- Long itemTotal = rmOpenCloseValveHistoryMapper.getUseWaterGtValueIntakesCount(params);
+ Long itemTotal = rmIntakeAmountDayMapper.getUseWaterGtValueIntakesCount(params);
QueryResultVo<List<VoIntakeAccumulateAmount>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = qo.pageSize ;
rsVo.pageCurr = qo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = rmOpenCloseValveHistoryMapper.getUseWaterGtValueIntakes(params);
+ rsVo.obj = rmIntakeAmountDayMapper.getUseWaterGtValueIntakes(params);
return rsVo ;
}
- /**
+ /** ok 4
* 鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
* @param qo
* @return
@@ -522,36 +517,64 @@
public QueryResultVo<List<VoIntakeAccumulateAmount>> getExpenseGtValueIntakes(IntakeAmountValueQO qo) {
String timeStart = qo.getTimeStart();
String timeStop = qo.getTimeStop();
- if(timeStart != null && timeStart != "") {
- timeStart = timeStart + " 00:00:00";
- } else {
- timeStart = LocalDate.now() + " 00:00:00";
+ if(timeStart == null || timeStart.trim().equals("")) {
+ timeStart = DateTime.yyyy_MM_dd() ;
+ qo.setTimeStart(timeStart);
}
- qo.setTimeStart(timeStart);
-
- if(timeStop != null && timeStop != "") {
- timeStop = timeStop + " 23:59:59";
- }else {
- timeStop = LocalDate.now() + " 23:59:59";
+ if(timeStop == null || timeStop.trim().equals("")) {
+ timeStop = DateTime.yyyy_MM_dd() ;
+ qo.setTimeStop(timeStop);
}
- qo.setTimeStop(timeStop);
-
if (qo.getValue() == null){
qo.setValue(0.0);
}
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
- Long itemTotal = rmOpenCloseValveHistoryMapper.getExpenseGtValueIntakesCount(params);
+ Long itemTotal = rmIntakeAmountDayMapper.getExpenseGtValueIntakesCount(params);
QueryResultVo<List<VoIntakeAccumulateAmount>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = qo.pageSize ;
rsVo.pageCurr = qo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = rmOpenCloseValveHistoryMapper.getExpenseGtValueIntakes(params);
+ rsVo.obj = rmIntakeAmountDayMapper.getExpenseGtValueIntakes(params);
return rsVo ;
}
+ /** ok 4
+ * 鎸囧畾鏃堕棿娈靛唴娑堣垂閲戦瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoIntakeAccumulateAmount>> getUseWaterTimesGtValueIntakes(IntakeCountValueQO qo) {
+ String timeStart = qo.getTimeStart();
+ String timeStop = qo.getTimeStop();
+ if(timeStart == null || timeStart.trim().equals("")) {
+ timeStart = DateTime.yyyy_MM_dd() ;
+ qo.setTimeStart(timeStart);
+ }
+ if(timeStop == null || timeStop.trim().equals("")) {
+ timeStop = DateTime.yyyy_MM_dd() ;
+ qo.setTimeStop(timeStop);
+ }
+ if (qo.getValue() == null){
+ qo.setValue(0);
+ }
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmIntakeAmountDayMapper.getUseWaterTimesGtValueIntakesCount(params);
+
+ QueryResultVo<List<VoIntakeAccumulateAmount>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmIntakeAmountDayMapper.getUseWaterTimesGtValueIntakes(params);
+ return rsVo ;
+ }
+
+
+
/**
* 鎸囧畾鏃堕棿娈靛唴鐢ㄦ按鏃堕暱瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
* @param qo
--
Gitblit v1.8.0