From 094a9290c836827bc1f45fd3549e7cd2ea1e1e45 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 07 十一月 2023 09:45:36 +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 | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 659ea8d..a8a00ee 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
@@ -1,14 +1,14 @@
package org.jeecg.modules.mdc.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.jeecg.modules.mdc.entity.MdcDeviceCalendar;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.entity.MdcDeviceCalendar;
import org.jeecg.modules.mdc.vo.EquipmentCalendarVo;
import org.jeecg.modules.mdc.vo.MdcDeviceCalendarQueryVo;
import org.jeecg.modules.mdc.vo.MdcDeviceCalendarVo;
import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -37,4 +37,33 @@
* @return
*/
List<MdcDeviceCalendarVo> listByEquipmentAndDate(String equipmentid, List<String> stringDates);
+
+ /**
+ * 璁＄畻瀹為檯鐝骇澶╂暟
+ *
+ * @param shiftSubId
+ * @param equipmentId
+ * @param validDate
+ * @return
+ */
+ BigDecimal computeActualWorkDayCount(String shiftSubId, String equipmentId, String validDate);
+
+ /**
+ * 鏌ヨ鐝鍒嗙被
+ *
+ * @param equipmentId
+ * @param validDate
+ * @return
+ */
+ List<String> findShiftSort(String equipmentId, String validDate);
+
+ /**
+ * 璁＄畻鐝鏃堕棿
+ *
+ * @param shiftSubId
+ * @param equipmentId
+ * @param validDate
+ * @return
+ */
+ BigDecimal computeShiftTimeCount(String shiftSubId, String equipmentId, String validDate);
}
--
Gitblit v1.9.3