From 21b8b0078354b6434351d80222c5944f80606491 Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期三, 26 三月 2025 17:30:27 +0800
Subject: [PATCH] Merge branch 'develop1.0' of https://github.com/Andy-Yin/zhitan-ems into develop1.0
---
zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java
index 443fc99..73859cb 100644
--- a/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java
@@ -39,7 +39,7 @@
public BranchAnalysisVO getBranchAnalysisService(BranchAnalysisDTO dto) {
String timeType = dto.getTimeType();
String dataTime = dto.getDataTime();
- Date beginTime = DateTimeUtil.getTypeTime(timeType, dataTime);
+ Date beginTime = DateTimeUtil.getTime(timeType, dataTime);
DateTime endTime = null;
List<ModelNodeIndexInfo> nodeIndexInfo = modelNodeMapper.getModelNodeIndexIdByNodeId(dto.getNodeId(), dto.getEnergyType());
@@ -68,7 +68,7 @@
default:
throw new ServiceException("鏃堕棿鏍煎紡閿欒");
}
- //鑾峰彇鏁版嵁椤瑰垪琛�
+
List<DataItem> dataItemlist = dataItemMapper.getDataItemTimeRangeInforByIndexIds(beginTime, endTime, timeType, indexlist);
BranchAnalysisVO vo = new BranchAnalysisVO();
--
Gitblit v1.9.3