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/comprehensivestatistics/mapper/DailyComprehensiveMapper.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java
index 08777d9..4ce024d 100644
--- a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java
@@ -1,6 +1,5 @@
package com.zhitan.comprehensivestatistics.mapper;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.comprehensivestatistics.domain.DailyComprehensive;
import org.apache.ibatis.annotations.Param;
@@ -14,17 +13,17 @@
* @date 2020-03-25
*/
public interface DailyComprehensiveMapper {
- public List<DailyComprehensive> getDailyComprehensiveList(@Param("nodeId") String nodeId,
+ List<DailyComprehensive> getDailyComprehensiveList(@Param("nodeId") String nodeId,
@Param("dataList") List<DailyComprehensive> dataList,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
List<DailyComprehensive> getListChart(@Param("indexId") String indexId,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
}
--
Gitblit v1.9.3