From b46815639664c65d31f6f852c4bf403f6ba0c3ea Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 26 一月 2024 10:04:49 +0800
Subject: [PATCH] 加班管理功能调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java
index ec22b51..00454ef 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentOvertimeServiceImpl.java
@@ -22,9 +22,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -143,13 +141,7 @@
BigDecimal result = new BigDecimal("0");
if (list != null && !list.isEmpty()) {
for (MdcEquipmentOvertime equipmentOvertime : list) {
- String date = DateUtils.format(DateUtils.toDate(validDate + "-01", DateUtils.STR_DATE), DateUtils.STR_DATE) + " ";
- String startTime = date + equipmentOvertime.getStartTime();
- String endTime = date + equipmentOvertime.getEndTime();
- LocalDateTime localStartTime = LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern(DateUtils.STR_DATE_TIME_SMALL));
- LocalDateTime localEndTime = LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern(DateUtils.STR_DATE_TIME_SMALL));
- int minutes = Math.toIntExact(Duration.between(localStartTime, localEndTime).toMinutes());
- result = result.add(new BigDecimal(minutes));
+ result = result.add(equipmentOvertime.getDuration().divide(new BigDecimal("60"), 0, RoundingMode.HALF_UP));
}
}
return result;
@@ -163,7 +155,7 @@
*/
@Override
public boolean addOvertime(MdcEquipmentOvertime mdcEquipmentOvertime) {
- String[] equipmentIds = mdcEquipmentOvertime.getEquipmentIds().split(",");
+ String[] equipmentIds = mdcEquipmentOvertime.getEquipmentId().split(",");
List<MdcEquipmentOvertime> mdcEquipmentOvertimes = new ArrayList<>();
// 璁＄畻鏃堕暱(绉�)
String startTime = mdcEquipmentOvertime.getStartTime();
--
Gitblit v1.9.3