From 7cb124e47f32af99c1098db89462f549a395254b Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 24 四月 2024 14:26:17 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/ProcessCountServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 013cde5..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;
@@ -80,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())) {
@@ -110,7 +108,7 @@
if (mdcProcessCountVo.getMdcSectionIds() == null || mdcProcessCountVo.getMdcSectionIds().isEmpty()) {
return null;
}
- return this.baseMapper.pageList(page, mdcProcessCountVo);
+ return this.baseMapper.pageList(mdcProcessCountVo);
}
@Override
@@ -119,7 +117,13 @@
return result == null ? BigDecimal.ZERO : result;
}
- @Transactional(readOnly = true)
+ @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;
//鍙栨渶鍚庣殑缁熻鏁版嵁
--
Gitblit v1.9.3