From 43a19a4424f67c379934ed0d70e0d1b3512cd769 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 27 三月 2025 09:31:44 +0800
Subject: [PATCH] 灌溉计划表中增加项目ID字段，计划列表返回值中增加项目名称，项目状态改为整数表示
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/VirtualCardSv.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 108 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/VirtualCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/VirtualCardSv.java
index 7718163..0c6f032 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/VirtualCardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/card/VirtualCardSv.java
@@ -2,8 +2,10 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoSe.SeVcOperateMapper;
-import com.dy.pipIrrGlobal.voSt.VoClientRegisterVC;
+import com.dy.pipIrrGlobal.voSt.VoClientStatistics;
import com.dy.pipIrrStatistics.card.qo.CommonQO;
+import com.dy.pipIrrStatistics.card.qo.StartStopDateQO;
+import com.dy.pipIrrStatistics.card.qo.TotalRechargeQO;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +34,7 @@
* @param qo
* @return
*/
- public QueryResultVo<List<VoClientRegisterVC>> getRegisterVcClients(CommonQO qo) {
+ public QueryResultVo<List<VoClientStatistics>> getRegisterVcClients(CommonQO qo) {
/**
* 琛ラ綈璧锋鏃堕棿锛屽鏋滃紑濮嬫椂闂翠负绌猴紝鍒欓粯璁や负褰撳墠鏃ユ湡
*/
@@ -55,7 +57,7 @@
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = Optional.ofNullable(seVcOperateMapper.getRegisterVcClientsCount(params)).orElse(0L);
- QueryResultVo<List<VoClientRegisterVC>> rsVo = new QueryResultVo<>() ;
+ QueryResultVo<List<VoClientStatistics>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = qo.pageSize ;
rsVo.pageCurr = qo.pageCurr ;
@@ -64,4 +66,107 @@
rsVo.obj = seVcOperateMapper.getRegisterVcClients(params);
return rsVo ;
}
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴娉ㄥ唽鎬绘暟閲�
+ * @param qo
+ * @return
+ */
+ public Long getRegisterCount(StartStopDateQO qo) {
+ /**
+ * 琛ラ綈璧锋鏃堕棿锛屽鏋滃紑濮嬫椂闂翠负绌猴紝鍒欓粯璁や负褰撳墠鏃ユ湡
+ */
+ String timeStart = qo.getTimeStart();
+ String timeStop = qo.getTimeStop();
+ if(timeStart != null) {
+ timeStart = timeStart + " 00:00:00";
+ }else {
+ timeStart = LocalDate.now() + " 00:00:00";
+ }
+ if(timeStop != null) {
+ timeStop = timeStop + " 23:59:59";
+ }
+ qo.setTimeStart(timeStart);
+ qo.setTimeStop(timeStop);
+
+ // 鐢熸垚鏌ヨ鍙傛暟
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+
+ // 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
+ return Optional.ofNullable(seVcOperateMapper.getRegisterCount(params)).orElse(0L);
+ }
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛厖鍊兼�绘暟閲�
+ * @param qo
+ * @return
+ */
+ public Long getRechargeCount(StartStopDateQO qo) {
+ /**
+ * 琛ラ綈璧锋鏃堕棿锛屽鏋滃紑濮嬫椂闂翠负绌猴紝鍒欓粯璁や负褰撳墠鏃ユ湡
+ */
+ String timeStart = qo.getTimeStart();
+ String timeStop = qo.getTimeStop();
+ if(timeStart != null) {
+ timeStart = timeStart + " 00:00:00";
+ }else {
+ timeStart = LocalDate.now() + " 00:00:00";
+ }
+ if(timeStop != null) {
+ timeStop = timeStop + " 23:59:59";
+ }
+ qo.setTimeStart(timeStart);
+ qo.setTimeStop(timeStop);
+
+ // 鐢熸垚鏌ヨ鍙傛暟
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+
+ return Optional.ofNullable(seVcOperateMapper.getRechargeCount(params)).orElse(0L);
+ }
+
+ /**
+ * 褰撳墠浣欓鎬婚噺
+ * @return
+ */
+ public Double getTotalBalance() {
+ return Optional.ofNullable(seVcOperateMapper.getTotalBalance()).orElse(0.0);
+ }
+
+ /**
+ * 鎸囧畾鏃堕棿娈靛唴铏氭嫙鍗″厖鍊奸噾棰濊秴杩囨寚瀹氬�肩殑鍐滄埛
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoClientStatistics>> getLargeRechargeClients(TotalRechargeQO qo) {
+ /**
+ * 琛ラ綈璧锋鏃堕棿锛屽鏋滃紑濮嬫椂闂翠负绌猴紝鍒欓粯璁や负褰撳墠鏃ユ湡
+ */
+ String timeStart = qo.getTimeStart();
+ String timeStop = qo.getTimeStop();
+ if(timeStart != null) {
+ timeStart = timeStart + " 00:00:00";
+ }else {
+ timeStart = LocalDate.now() + " 00:00:00";
+ }
+ if(timeStop != null) {
+ timeStop = timeStop + " 23:59:59";
+ }
+ qo.setTimeStart(timeStart);
+ qo.setTimeStop(timeStop);
+
+ // 鐢熸垚鏌ヨ鍙傛暟
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+
+ // 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
+ Long itemTotal = Optional.ofNullable(seVcOperateMapper.getLargeRechargeClientsCount(params)).orElse(0L);
+
+ QueryResultVo<List<VoClientStatistics>> rsVo = new QueryResultVo<>() ;
+
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = seVcOperateMapper.getLargeRechargeClients(params);
+ return rsVo ;
+ }
}
--
Gitblit v1.8.0