From ad31fa3817384ee3c09f2c64556cda72caeb651d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 24 十月 2024 16:16:06 +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 | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 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 99363fb..aba5d81 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
@@ -23,6 +23,7 @@
import com.ruoyi.order.mapper.TChargingBillMapper;
import com.ruoyi.order.mapper.TChargingOrderMapper;
import com.ruoyi.order.service.TChargingBillService;
+import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import org.omg.CORBA.PRIVATE_MEMBER;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -64,6 +65,13 @@
private AppUserCarClient appUserCarClient;
@Override
public ChargingBillVO chargingBillList1(ChargingListQuery dto) {
+ if (dto.getState()!=null){
+ if (dto.getState()==1){
+ dto.setState(2);
+ }else {
+ dto.setState(1);
+ }
+ }
ChargingBillVO chargingBillVO = new ChargingBillVO();
String startTime1 = null;
String startTime2 = null;
@@ -406,6 +414,13 @@
}
@Override
public ChargingBillVO chargingBillList(ChargingListQuery dto) {
+ if (dto.getState()!=null){
+ if (dto.getState()==1){
+ dto.setState(2);
+ }else {
+ dto.setState(1);
+ }
+ }
ChargingBillVO chargingBillVO = new ChargingBillVO();
String startTime1 = null;
String startTime2 = null;
@@ -643,6 +658,9 @@
chargingBillListVO.setChargingSecond(chargingSecond);
}
for (ChargingBillListVO chargingBillListVO : list1) {
+ if (chargingBillListVO.getType() ==1){
+ continue;
+ }
LocalDateTime billTime = chargingBillListVO.getBillTime();
// 将其转化为yyyy-MM格式字符串
chargingBillVO.setCreateTime(billTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
--
Gitblit v1.7.1