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/impl/MdcDeviceCalendarServiceImpl.java | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 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 db49109..5d3eec2 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
@@ -19,7 +19,10 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
/**
* @Description: 璁惧宸ヤ綔鏃ュ巻琛�
@@ -110,20 +113,21 @@
List<MdcDeviceCalendarVo> result = new ArrayList<>();
try {
//鏌ヨ榛樿鐝埗
- List<MdcDeviceCalendarVo> acquiesceShift = this.baseMapper.findAcquiesceShift();
+// List<MdcDeviceCalendarVo> acquiesceShift = this.baseMapper.findAcquiesceShift();
for (String stringDate : stringDates) {
List<MdcDeviceCalendarVo> mdcDeviceCalendarVos = this.baseMapper.listByEquipmentAndDate(equipmentId, stringDate);
if (mdcDeviceCalendarVos != null && !mdcDeviceCalendarVos.isEmpty()) {
result.addAll(mdcDeviceCalendarVos);
- } else {
- acquiesceShift.forEach(mdcDeviceCalendarVo -> {
- mdcDeviceCalendarVo.setEquipmentId(equipmentId);
- mdcDeviceCalendarVo.setEffectiveDate(stringDate);
- });
- // 璁剧疆榛樿鐝埗
- result.addAll(acquiesceShift);
}
+// else {
+// acquiesceShift.forEach(mdcDeviceCalendarVo -> {
+// mdcDeviceCalendarVo.setEquipmentId(equipmentId);
+// mdcDeviceCalendarVo.setEffectiveDate(stringDate);
+// });
+// // 璁剧疆榛樿鐝埗
+// result.addAll(acquiesceShift);
+// }
}
} catch (Exception e) {
e.printStackTrace();
@@ -132,4 +136,46 @@
return result;
}
+ /**
+ * 璁＄畻瀹為檯鐝骇澶╂暟
+ *
+ * @param shiftSubId
+ * @param equipmentId
+ * @param validDate
+ * @return
+ */
+ @Override
+ public BigDecimal computeActualWorkDayCount(String shiftSubId, String equipmentId, String validDate) {
+ validDate = validDate.replaceAll("-", "");
+ List<String> validDateList = this.baseMapper.computeActualWorkDayCount(shiftSubId, equipmentId, validDate);
+ return new BigDecimal(validDateList.size());
+ }
+
+ /**
+ * 鏌ヨ鐝鍒嗙被
+ *
+ * @param equipmentId
+ * @param validDate
+ * @return
+ */
+ @Override
+ public List<String> findShiftSort(String equipmentId, String validDate) {
+ validDate = validDate.replaceAll("-", "");
+ return this.baseMapper.findShiftSort(equipmentId, validDate);
+ }
+
+ /**
+ * 璁＄畻鐝鏃堕棿
+ *
+ * @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);
+ return new BigDecimal(shiftCount).multiply(new BigDecimal("8")).multiply(new BigDecimal("60"));
+ }
+
}
--
Gitblit v1.9.3