From 2b9ff0c274a847af41b2f5a04de1b23ed6fbb9bb Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 25 八月 2025 15:50:15 +0800
Subject: [PATCH] mdc模块更新
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java | 71 -----------------------------------
1 files changed, 0 insertions(+), 71 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 8612950..bec549b 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
@@ -16,7 +16,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Collections;
@@ -35,12 +34,6 @@
private IMdcEquipmentService mdcEquipmentService;
@Resource
private IMdcShiftSubService mdcShiftSubService;
-
- @Resource
- private IMdcVacationManagementService mdcVacationManagementService;
-
- @Resource
- private IMdcEquipmentOvertimeService mdcEquipmentOvertimeService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -127,47 +120,6 @@
}
/**
- * 璁＄畻瀹為檯鐝骇澶╂暟
- *
- * @param equipmentId
- * @param validDate
- * @return
- */
- @Override
- public BigDecimal computeActualWorkDayCount(String equipmentId, String validDate) {
- validDate = validDate.replaceAll("-", "");
- List<String> validDateList = this.baseMapper.computeActualWorkDayCount(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 equipmentId
- * @param validDate
- * @return
- */
- @Override
- public BigDecimal computeShiftTimeCount(String equipmentId, String validDate) {
- validDate = validDate.replaceAll("-", "");
- Integer shiftCount = this.baseMapper.computeShiftTimeCount(equipmentId, validDate);
- return new BigDecimal(shiftCount).multiply(new BigDecimal("8")).multiply(new BigDecimal("60"));
- }
-
- /**
* 鑷姩鐢熸垚璁惧宸ヤ綔鏃ュ巻
*/
@Override
@@ -183,8 +135,6 @@
for (MdcEquipment mdcEquipment : equipmentList) {
List<MdcDeviceCalendar> list = super.list(new LambdaQueryWrapper<MdcDeviceCalendar>().eq(MdcDeviceCalendar::getEquipmentId, mdcEquipment.getEquipmentId()).eq(MdcDeviceCalendar::getEffectiveDate, localDate.replaceAll("-", "")));
if (list == null || list.isEmpty()) {
- List<MdcVacationManagement> vacationManagementList = mdcVacationManagementService.list(new LambdaQueryWrapper<MdcVacationManagement>().eq(MdcVacationManagement::getEquipmentId, mdcEquipment.getEquipmentId()).eq(MdcVacationManagement::getVacationDate, localDate));
- if (vacationManagementList == null || vacationManagementList.isEmpty()) {
String effectiveDate = localDate.replaceAll("-", "");
for (MdcDeviceCalendarVo mdcDeviceCalendarVo : acquiesceShift) {
MdcDeviceCalendar mdcDeviceCalendar = new MdcDeviceCalendar();
@@ -194,32 +144,11 @@
mdcDeviceCalendar.setShiftSubId(mdcDeviceCalendarVo.getShiftSubId());
result.add(mdcDeviceCalendar);
}
- }
}
}
if (!result.isEmpty()) {
super.saveBatch(result);
}
- }
-
- @Override
- public MdcDeviceCalendar getFirstData(String equipmentId) {
- return this.baseMapper.getFirstData(equipmentId);
- }
-
- @Override
- public List<MdcDeviceCalendarVo> listByEquipmentIdAndDate(String equipmentId, String date) {
- List<MdcDeviceCalendarVo> mdcDeviceCalendarVos = this.baseMapper.listByEquipmentAndDate(equipmentId, date);
- if (mdcDeviceCalendarVos != null && !mdcDeviceCalendarVos.isEmpty()) {
- for (MdcDeviceCalendarVo mdcDeviceCalendarVo : mdcDeviceCalendarVos) {
- List<MdcEquipmentOvertime> list = mdcEquipmentOvertimeService.list(new LambdaQueryWrapper<MdcEquipmentOvertime>().eq(MdcEquipmentOvertime::getEquipmentId, mdcDeviceCalendarVo.getEquipmentId()).eq(MdcEquipmentOvertime::getTheDate, mdcDeviceCalendarVo.getEndDate()));
- if (list != null && !list.isEmpty()) {
- mdcDeviceCalendarVo.setOvertimeStartTime(list.get(0).getStartTime());
- mdcDeviceCalendarVo.setOvertimeEndTime(list.get(0).getEndTime());
- }
- }
- }
- return mdcDeviceCalendarVos;
}
}
--
Gitblit v1.9.3