From 3087ff4ccc174d5952e9650ac3fae61eff477554 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 01 四月 2024 10:42:55 +0800
Subject: [PATCH] 修改 流量计实体增加监测站ID外键和驼峰命名 流量计监测站绑定接口（同步修改流量计的监测站ID外键 和 绑定记录表） 流量计监测站解绑接口（同步修改流量计的监测站ID外键 和 绑定记录表） 条件查询监测站（绑定状态判定） 条件查询已绑定的流量计 回退误修改的获取绑定记录
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java | 18 +-----------------
1 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java
index d30e913..ce11f65 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeSv.java
@@ -11,7 +11,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -33,32 +32,16 @@
public QueryResultVo<List<VoRecharge>> getRecharges(QueryVo queryVo) {
//瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
- //LocalDateTime rechargeTimeStart = queryVo.rechargeTimeStart;
- //LocalDateTime rechargeTimeStop = queryVo.rechargeTimeStop;
- //if(rechargeTimeStart != null) {
- // rechargeTimeStart = LocalDateTime.parse(df.format(rechargeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- // queryVo.setRechargeTimeStart(rechargeTimeStart);
- //}
- //
- //if(rechargeTimeStop != null) {
- // rechargeTimeStop = LocalDateTime.parse(df.format(rechargeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- // queryVo.setRechargeTimeStop(rechargeTimeStop);
- //}
-
String rechargeTimeStart = queryVo.rechargeTimeStart;
String rechargeTimeStop = queryVo.rechargeTimeStop;
if(rechargeTimeStart != null) {
rechargeTimeStart = rechargeTimeStart + " 00:00:00";
queryVo.setRechargeTimeStart(rechargeTimeStart);
}
-
if(rechargeTimeStop != null) {
rechargeTimeStop = rechargeTimeStop + " 23:59:59";
queryVo.setRechargeTimeStop(rechargeTimeStop);
}
-
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
@@ -67,6 +50,7 @@
QueryResultVo<List<VoRecharge>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = queryVo.pageSize ;
rsVo.pageCurr = queryVo.pageCurr ;
+
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seRechargeMapper.getRecharges(params);
return rsVo ;
--
Gitblit v1.8.0