From cd538c53101fd31982f41e86a6a06e928600a6d6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 十月 2024 15:36:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
index 280cabf..6d674f6 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
@@ -126,7 +126,7 @@
// LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
// todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59
LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
- LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
+ LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);
QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
.between("create_time", firstDayOfMonth, lastDayOfMonth)
.eq("status", 5)
@@ -333,7 +333,7 @@
// LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
// todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59
LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
- LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
+ LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);
QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
.between("create_time", firstDayOfMonth, lastDayOfMonth)
.eq("status", 5)
@@ -427,7 +427,7 @@
PageInfo<ChargingBillListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
PageInfo<ChargingBillListVO> pageInfo1 = new PageInfo<>(1,9999999);
List<ChargingBillListVO> list = this.baseMapper.chargingBillList(pageInfo,dto,startTime1,startTime2);
- List<ChargingBillListVO> list1 = this.baseMapper.chargingBillList1(pageInfo,dto,startTime1,startTime2);
+ List<ChargingBillListVO> list1 = this.baseMapper.chargingBillList(pageInfo1,dto,startTime1,startTime2);
BigDecimal paymentAmountTotal = new BigDecimal("0");
BigDecimal orderAmountTotal = new BigDecimal("0");
BigDecimal electrovalenceTotal = new BigDecimal("0");
@@ -478,7 +478,7 @@
// LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
// todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59
LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
- LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
+ LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);
QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
.between("create_time", firstDayOfMonth, lastDayOfMonth)
.eq("status", 5)
@@ -674,7 +674,7 @@
// LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
// todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59
LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
- LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);
+ LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);
QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
.between("create_time", firstDayOfMonth, lastDayOfMonth)
.eq("status", 5)
--
Gitblit v1.7.1