From 816df6ec0a43ef777e0d4cd0daff61f870626d83 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 05 六月 2025 13:53:12 +0800
Subject: [PATCH] feat(system): 添加节假日管理功能- 新增 SysHolidayController、SysHoliday、SysHolidayMapper、SysHolidayServiceImpl 和 ISysHolidayService 类- 实现节假日信息的增删改查和导出功能 - 添加工作日判断方法 - 新增相关 API 接口
---
zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java
index 6661e6a..5cbff37 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelInfoServiceImpl.java
@@ -148,10 +148,11 @@
if (CollectionUtils.isNotEmpty(meterImplements)) {
MeterImplement infor = meterImplements.get(0);
indexName = infor.getInstallactionLocation() + "_" + infor.getMeterName() + "_" + indexName;
+ pointData.setIndexName(indexName);
+ pointData.setIndexId(indexInfo.getIndexId());
+ voList.add(pointData);
}
- pointData.setIndexName(indexName);
- pointData.setIndexId(indexInfo.getIndexId());
- voList.add(pointData);
+
}
return voList;
}
--
Gitblit v1.9.3