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/MdcNoplanCloseServiceImpl.java | 29 ----------------------------- 1 files changed, 0 insertions(+), 29 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java index 661dc7c..c1c8b40 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcNoplanCloseServiceImpl.java @@ -23,10 +23,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.math.BigDecimal; -import java.time.Duration; -import java.time.LocalDateTime; -import java.time.ZoneId; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -320,29 +316,4 @@ return mv; } - @Override - public BigDecimal findNoplanTimeDuration(String equipmentId, String validDate, String noplanType) { - BigDecimal result = new BigDecimal("0"); - String startDate = DateUtils.format(DateUtils.toDate(validDate + "-01", DateUtils.STR_DATE), DateUtils.STR_DATE) + " 00:00:00"; - Date startTime = DateUtils.toDate(startDate, DateUtils.STR_DATE_TIME_SMALL); - String endDate = DateUtils.format(DateUtils.addMonth(1, DateUtils.toDate(startDate, DateUtils.STR_DATE_TIME_SMALL)), DateUtils.STR_DATE_TIME_SMALL); - Date endTime = DateUtils.toDate(endDate, DateUtils.STR_DATE_TIME_SMALL); - List<MdcNoplanClose> mdcNoplanCloseList = this.baseMapper.findNoplanTimeDuration(equipmentId, noplanType, startDate, endDate); - // 鏃堕棿淇 骞惰绠� - if (mdcNoplanCloseList != null && !mdcNoplanCloseList.isEmpty()) { - for (MdcNoplanClose mdcNoplanClose : mdcNoplanCloseList) { - if (mdcNoplanClose.getStartTime().before(startTime)) { - mdcNoplanClose.setStartTime(startTime); - } - if (mdcNoplanClose.getEndTime().after(endTime)) { - mdcNoplanClose.setEndTime(endTime); - } - LocalDateTime localStartDate = LocalDateTime.ofInstant(mdcNoplanClose.getStartTime().toInstant(), ZoneId.systemDefault()); - LocalDateTime localEndDate = LocalDateTime.ofInstant(mdcNoplanClose.getEndTime().toInstant(), ZoneId.systemDefault()); - int minutes = Math.toIntExact(Duration.between(localStartDate, localEndDate).toMinutes()); - result = result.add(new BigDecimal(minutes)); - } - } - return result; - } } -- Gitblit v1.9.3