From 3880de9f96b068dfa8b1f35fcac0060f3d4ad604 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 15:08:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWorkCalendarService.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWorkCalendarService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWorkCalendarService.java
index bd2cb96..95d639f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWorkCalendarService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWorkCalendarService.java
@@ -1,5 +1,6 @@
package com.aps.core.service;
+import com.alibaba.fastjson2.JSONArray;
import com.aps.core.domain.ApsWorkCalendar;
import java.util.List;
@@ -59,4 +60,19 @@
* @return 缁撴灉
*/
public int deleteApsWorkCalendarById(Long id);
+
+ /**
+ * 鑾峰彇鏃ュ巻瑙嗗浘
+ * @param applicableFactory
+ * @param datetime
+ * @return
+ */
+ public JSONArray getWorkCalendar(String applicableFactory, String datetime);
+
+ /**
+ * 鑾峰彇鏃ュ巻瑙嗗浘鏁版嵁
+ * @param apsWorkCalendar
+ * @return JSONArray
+ */
+ JSONArray selectCalendarView(ApsWorkCalendar apsWorkCalendar);
}
--
Gitblit v1.9.3