From 87ca59fe207efa4bbd4029ca1d2ed38c11963682 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 九月 2024 14:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java |   75 +++++++++++++++++++++++++++++++++++--
 1 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index f969373..85e408c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1805,7 +1805,7 @@
 		String endTime = dto.getEndTime();
 		// 将这两个时间转化为localDateTime
 		// 创建 DateTimeFormatter 对象，指定格式
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH:mm:ss");
 
 		// 将字符串解析为 LocalDateTime 对象
 		LocalDateTime localDateTime = LocalDateTime.parse(startTime, formatter);
@@ -1819,10 +1819,10 @@
 				.eq("recharge_payment_status",2);
 		switch (dto.getType()){
 			case 1:
-				eq.between("start_time", startTime, endTime);
+				eq.between("start_time", localDateTime, localDateTime1);
 				break;
 			case 2:
-				eq.between("end_time", startTime, endTime);
+				eq.between("end_time", localDateTime, localDateTime1);
 				break;
 		}
 		List<TChargingOrder> tChargingOrders = this.baseMapper.selectList(eq);
@@ -1907,7 +1907,7 @@
 			tSettlementConfirm.setVenue(dto.getVenue());
 			tSettlementConfirm.setMetering(dto.getMetering());
 			tSettlementConfirm.setClean(dto.getClean());
-			tSettlementConfirm.setLossElectronic(dto.getLossElectronic());
+			tSettlementConfirm.setLossElectronic(dto.getMeteringElectronic().subtract(dto.getChargingElectronic()));
 			tSettlementConfirm.setMaintain(dto.getMaintain());
 
 			tSettlementConfirm.setMeteringElectronic(dto.getMeteringElectronic());
@@ -1949,7 +1949,7 @@
 
 		}
 		pageInfo.setRecords(list);
-		return null;
+		return pageInfo;
 	}
 
 	@Override
@@ -2134,6 +2134,71 @@
 		return res;
 	}
 
+	@Override
+	public List<Map<String, Object>> countBySource(List<Integer> siteIds) {
+		return this.baseMapper.countBySource(siteIds);
+	}
+
+	@Override
+	public List<Map<String, Object>> equipmentUserType1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.equipmentUserType1(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> equipmentUserType2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.equipmentUserType2(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> equipmentMapbroke1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.equipmentMapbroke1(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> equipmentMapbroke2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.equipmentMapbroke2(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> equipmentMapOut1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.equipmentMapOut1(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> equipmentMapOut2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.equipmentMapOut2(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> needElec(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto) {
+		return this.baseMapper.needElec(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> getHourType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto) {
+		return this.baseMapper.getHourType(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> getDateType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto) {
+		return this.baseMapper.getDateType(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> getMonthType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto) {
+		return this.baseMapper.getMonthType(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> getchargingCapacity(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto) {
+		return this.baseMapper.getchargingCapacity(siteIds,statisticsQueryDto);
+	}
+
+	@Override
+	public List<Map<String, Object>> countAllUserData() {
+		return this.baseMapper.countAllUserData();
+	}
+
 	public static void main(String[] args) {
 //		String format = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));
 //		String format1 = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));

--
Gitblit v1.7.1