From 5677ab158fb78d1267c16bbbf29eb690e0b4039f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:53:39 +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/MdcEquipmentStatisticalShiftInfoServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java
index a24c990..fc35524 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java
@@ -80,13 +80,12 @@
*
* @param equipmentId
* @param validDate
- * @param shiftSubId
* @return
*/
@Override
- public BigDecimal findSpindleRunDuration(String equipmentId, String validDate, String shiftSubId) {
+ public BigDecimal findSpindleRunDuration(String equipmentId, String validDate) {
validDate = validDate.replaceAll("-", "");
- BigDecimal duration = this.baseMapper.findSpindleRunDuration(equipmentId, validDate, shiftSubId);
+ BigDecimal duration = this.baseMapper.findSpindleRunDuration(equipmentId, validDate);
if (duration != null && duration.compareTo(BigDecimal.ZERO) != 0) {
return duration.divide(new BigDecimal("60"), 0, RoundingMode.HALF_UP);
} else {
--
Gitblit v1.9.3