From e331906c3191f012deb28ee18384a7087d987687 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 19:16:57 +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/impl/MdcDeviceCalendarServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
index 06d005d..89dc713 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
@@ -146,15 +146,14 @@
/**
* 璁＄畻瀹為檯鐝骇澶╂暟
*
- * @param shiftSubId
* @param equipmentId
* @param validDate
* @return
*/
@Override
- public BigDecimal computeActualWorkDayCount(String shiftSubId, String equipmentId, String validDate) {
+ public BigDecimal computeActualWorkDayCount(String equipmentId, String validDate) {
validDate = validDate.replaceAll("-", "");
- List<String> validDateList = this.baseMapper.computeActualWorkDayCount(shiftSubId, equipmentId, validDate);
+ List<String> validDateList = this.baseMapper.computeActualWorkDayCount(equipmentId, validDate);
return new BigDecimal(validDateList.size());
}
@@ -174,14 +173,13 @@
/**
* 璁＄畻鐝鏃堕棿
*
- * @param shiftSubId
* @param equipmentId
* @param validDate
* @return
*/
@Override
- public BigDecimal computeShiftTimeCount(String shiftSubId, String equipmentId, String validDate) {
- Integer shiftCount = this.baseMapper.computeShiftTimeCount(shiftSubId, equipmentId, validDate);
+ public BigDecimal computeShiftTimeCount(String equipmentId, String validDate) {
+ Integer shiftCount = this.baseMapper.computeShiftTimeCount(equipmentId, validDate);
return new BigDecimal(shiftCount).multiply(new BigDecimal("8")).multiply(new BigDecimal("60"));
}
--
Gitblit v1.9.3