From e88c6ac544e52359c7eabc94edef7bb1e133c7e2 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 18 三月 2025 16:49:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java
index 285bb7c..8826b16 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
+import org.jeecg.modules.mdc.dto.MdcDowntimeDto;
import org.jeecg.modules.mdc.entity.MdcDowntime;
import org.jeecg.modules.mdc.mapper.MdcDowntimeMapper;
import org.jeecg.modules.mdc.service.IMdcDowntimeService;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
+import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.MdcDowntimeVo;
import org.springframework.stereotype.Service;
@@ -38,7 +40,7 @@
* @return
*/
@Override
- public IPage<MdcDowntime> pageList(String userId, Page<MdcDowntime> page, MdcDowntimeVo mdcDowntimeVo, HttpServletRequest req) {
+ public IPage<MdcDowntimeDto> pageList(String userId, Page<MdcDowntimeDto> page, MdcDowntimeVo mdcDowntimeVo, HttpServletRequest req) {
// 鑾峰彇璁惧ID鍒楄〃
List<String> equipmentIds = getEquipmentIds(userId, mdcDowntimeVo);
@@ -54,6 +56,18 @@
return this.baseMapper.pageList(page, mdcDowntimeVo);
}
+ @Override
+ public Integer findPlanTimeDuration(String equipmentId, String validDate, String closeType) {
+ int result = 0;
+ List<MdcDowntime> mdcDowntimeList = this.baseMapper.findPlanTimeDuration(equipmentId, validDate, closeType);
+ if (mdcDowntimeList != null && !mdcDowntimeList.isEmpty()) {
+ for (MdcDowntime mdcDowntime : mdcDowntimeList) {
+ result = DateUtils.differentMinutes(mdcDowntime.getStartDate(), mdcDowntime.getEndDate()) + result;
+ }
+ }
+ return result;
+ }
+
private List<String> getEquipmentIds(String userId, MdcDowntimeVo mdcDowntimeVo) {
if (StringUtils.isNotEmpty(mdcDowntimeVo.getEquipmentId())) {
return Collections.singletonList(mdcDowntimeVo.getEquipmentId());
--
Gitblit v1.9.3