From 733cad83ed9a5fdc459aa7bf715edd6bd4862f12 Mon Sep 17 00:00:00 2001 From: DYL0109 <dn18191638832@163.com> Date: 星期四, 20 三月 2025 21:21:57 +0800 Subject: [PATCH] Merge pull request #17 from Andy-Yin/zt_from_develop1.0 --- zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/MonthlyKeyEquipmentServiceImpl.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/MonthlyKeyEquipmentServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/MonthlyKeyEquipmentServiceImpl.java index d76e549..577484e 100644 --- a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/MonthlyKeyEquipmentServiceImpl.java +++ b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/MonthlyKeyEquipmentServiceImpl.java @@ -1,6 +1,5 @@ package com.zhitan.keyequipment.service.impl; -import com.zhitan.common.enums.TimeType; import com.zhitan.keyequipment.domain.MonthlyKeyEquipment; import com.zhitan.keyequipment.mapper.MonthlyKeyEquipmentMapper; import com.zhitan.keyequipment.service.IMonthlyKeyEquipmentService; @@ -23,7 +22,7 @@ private MonthlyKeyEquipmentMapper monthlyKeyEquipmentMapper; @Override - public List<MonthlyKeyEquipment> getMonthlyKeyEquipmentList(List<String> indexIds, List<MonthlyKeyEquipment> dataList, Date beginTime, Date endTime, TimeType timeType, String indexStorageId){ + public List<MonthlyKeyEquipment> getMonthlyKeyEquipmentList(List<String> indexIds, List<MonthlyKeyEquipment> dataList, Date beginTime, Date endTime, String timeType, String indexStorageId){ if (indexIds != null && !indexIds.isEmpty()) { return monthlyKeyEquipmentMapper.getMonthlyKeyEquipmentList(indexIds, dataList, beginTime, endTime, timeType, indexStorageId); } @@ -31,7 +30,7 @@ } @Override - public List<MonthlyKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId){ + public List<MonthlyKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, String timeType, String indexStorageId){ if (indexId != null && !indexId.isEmpty()) { return monthlyKeyEquipmentMapper.getListChart(indexId,beginTime,endTime,timeType,indexStorageId); } -- Gitblit v1.9.3