From 20a7735a6831064c9d5bea12c50f63729f2db2fc Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期六, 06 一月 2024 15:36:11 +0800
Subject: [PATCH] mdc更新
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java
index 226a957..562dbb1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java
@@ -14,6 +14,7 @@
//import org.jeecg.modules.system.entity.SysUpload;
//import org.jeecg.modules.system.entity.SysUploadRela;
//import org.jeecg.modules.system.service.IUploadRelaService;
+import org.jeecg.modules.eam.vo.RepairReportExportVo;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description: equipment_report_repair
@@ -104,8 +106,33 @@
}
List<String> equipNums = new ArrayList<>();
if(StringUtils.isNotBlank((String)params.get("nums"))){
- equipNums = Arrays.asList(((String) params.get("nums")).trim().split(","));
+ equipNums = Arrays.asList(((String) params.get("nums")).trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
}
return super.getBaseMapper().getReportRepairList(pageData, params,equipNums) ;
}
+
+ @Override
+ public List<RepairReportExportVo> exportList(RepairReportExportVo repairReportExportVo) {
+ List<String> equipNums = new ArrayList<>();
+ if(StringUtils.isNotBlank(repairReportExportVo.getNums())){
+ equipNums = Arrays.asList(repairReportExportVo.getNums().trim().split("\n"));
+ }
+ return baseMapper.exportList(
+ repairReportExportVo.getNum(),
+ repairReportExportVo.getFaultStartTime(),
+ repairReportExportVo.getFaultEndTime(),
+ repairReportExportVo.getIsStop(),
+ repairReportExportVo.getStatus(),
+ repairReportExportVo.getErrUda2(),
+ repairReportExportVo.getErrUda1(),
+ repairReportExportVo.getCreateBy(),
+ repairReportExportVo.getEquipmentNum(),
+ repairReportExportVo.getEquipmentName(),
+ repairReportExportVo.getModel(),
+ repairReportExportVo.getSpecification(),
+ repairReportExportVo.getUseId(),
+ equipNums
+ );
+
+ }
}
--
Gitblit v1.9.3