From 378dc038fc63cd9003497f9a458376e781df64db Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期日, 28 四月 2024 10:59:30 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java
index 021968f..16dd654 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java
@@ -1,7 +1,5 @@
package org.jeecg.modules.mdc.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
@@ -22,6 +20,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -79,7 +78,7 @@
* @return
*/
@Override
- public IPage<MdcProcessCountDto> pageList(String userId, Page<MdcProcessCountDto> page, MdcProcessCountVo mdcProcessCountVo, HttpServletRequest req) {
+ public List<MdcProcessCountDto> pageList(String userId, MdcProcessCountVo mdcProcessCountVo, HttpServletRequest req) {
List<String> equipmentIds = new ArrayList<>();
if (StringUtils.isNotEmpty(mdcProcessCountVo.getParentId()) && StringUtils.isEmpty(mdcProcessCountVo.getEquipmentId())) {
if ("2".equals(mdcProcessCountVo.getTypeTree())) {
@@ -109,10 +108,22 @@
if (mdcProcessCountVo.getMdcSectionIds() == null || mdcProcessCountVo.getMdcSectionIds().isEmpty()) {
return null;
}
- return this.baseMapper.pageList(page, mdcProcessCountVo);
+ return this.baseMapper.pageList(mdcProcessCountVo);
}
- @Transactional(readOnly = true)
+ @Override
+ public BigDecimal findDuration(String equipmentId, String validDate) {
+ BigDecimal result = this.baseMapper.findDuration(equipmentId, validDate.replaceAll("-", ""));
+ return result == null ? BigDecimal.ZERO : result;
+ }
+
+ @Override
+ public BigDecimal findCount(String equipmentId, String validDate) {
+ BigDecimal result = this.baseMapper.findCount(equipmentId, validDate.replaceAll("-", ""));
+ return result == null ? BigDecimal.ZERO : result;
+ }
+
+// @Transactional(readOnly = true)
List<MdcProcessCount> processCount(MdcEquipment mdcEquipment) {
Date initDate = null;
//鍙栨渶鍚庣殑缁熻鏁版嵁
@@ -197,13 +208,15 @@
}
//璁＄畻鍔犲伐鏃堕暱
long duration = this.handleProcessDuration(equipmentRunningSectionList);
- MdcProcessCount mdcProcessCount = new MdcProcessCount();
- mdcProcessCount.setEquipmentId(mdcEquipment.getEquipmentId());
- mdcProcessCount.setEquipmentName(mdcEquipment.getEquipmentName());
- mdcProcessCount.setSequenceNumber(sequenceNumber);
- mdcProcessCount.setDuration(duration);
- mdcProcessCount.setTheDate(stringDate);
- resultList.add(mdcProcessCount);
+ if (duration != 0 && duration < 100000) {
+ MdcProcessCount mdcProcessCount = new MdcProcessCount();
+ mdcProcessCount.setEquipmentId(mdcEquipment.getEquipmentId());
+ mdcProcessCount.setEquipmentName(mdcEquipment.getEquipmentName());
+ mdcProcessCount.setSequenceNumber(sequenceNumber);
+ mdcProcessCount.setDuration(duration);
+ mdcProcessCount.setTheDate(stringDate);
+ resultList.add(mdcProcessCount);
+ }
}
}
}
--
Gitblit v1.9.3