From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDeviceCalendarService.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDeviceCalendarService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDeviceCalendarService.java
index a8a00ee..7c055ed 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDeviceCalendarService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDeviceCalendarService.java
@@ -41,12 +41,11 @@
/**
* 璁＄畻瀹為檯鐝骇澶╂暟
*
- * @param shiftSubId
* @param equipmentId
* @param validDate
* @return
*/
- BigDecimal computeActualWorkDayCount(String shiftSubId, String equipmentId, String validDate);
+ BigDecimal computeActualWorkDayCount(String equipmentId, String validDate);
/**
* 鏌ヨ鐝鍒嗙被
@@ -60,10 +59,18 @@
/**
* 璁＄畻鐝鏃堕棿
*
- * @param shiftSubId
* @param equipmentId
* @param validDate
* @return
*/
- BigDecimal computeShiftTimeCount(String shiftSubId, String equipmentId, String validDate);
+ BigDecimal computeShiftTimeCount(String equipmentId, String validDate);
+
+ /**
+ * 鐢熸垚璁惧宸ヤ綔鏃ュ巻
+ */
+ void generateDeviceCalendar();
+
+ MdcDeviceCalendar getFirstData(String equipmentId);
+
+ List<MdcDeviceCalendarVo> listByEquipmentIdAndDate(String equipmentId, String date);
}
--
Gitblit v1.9.3