From 154cb8066d8fe14e7549d2ada68f905c3be39a9e Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 09 七月 2025 18:07:32 +0800
Subject: [PATCH] 修改导入
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 5a19efb..a2233c6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -18,6 +18,7 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.dto.EamEquipmentDto;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentExtend;
import org.jeecg.modules.eam.request.EamEquipmentQuery;
@@ -27,11 +28,14 @@
import org.jeecg.modules.eam.vo.EquipmentSearchResult;
//import org.jeecg.modules.mdc.entity.MdcEquipment;
//import org.jeecg.modules.mdc.service.IMdcEquipmentService;
+import org.jeecg.modules.system.entity.BaseFactory;
+import org.jeecg.modules.system.service.IBaseFactoryService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -41,6 +45,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -70,6 +75,8 @@
private ObjectMapper objectMapper;
@Autowired
private TranslateDictTextUtils translateDictTextUtils;
+ @Autowired
+ private IBaseFactoryService baseFactoryService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -211,18 +218,23 @@
public ModelAndView exportXls(HttpServletRequest request,EamEquipmentQuery eamEquipment) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
List<EamEquipment> equipmentList=eamEquipmentService.exportList(eamEquipment);
+ List<EamEquipmentDto> eamEquipmentDtos=new ArrayList<>();
String selections = request.getParameter("selections");
if (oConvertUtils.isNotEmpty(selections)) {
List<String> selectionList = Arrays.asList(selections.split(","));
equipmentList = equipmentList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
-
+ equipmentList.forEach(item -> {
+ EamEquipmentDto eamEquipmentDto = new EamEquipmentDto();
+ BeanUtils.copyProperties(item,eamEquipmentDto);
+ eamEquipmentDtos.add(eamEquipmentDto);
+ });
// Step.3 AutoPoi 瀵煎嚭Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
mv.addObject(NormalExcelConstants.FILE_NAME, "璁惧鍙拌处"); //姝ゅ璁剧疆鐨刦ilename鏃犳晥 ,鍓嶇浼氶噸鏇存柊璁剧疆涓�涓�
- mv.addObject(NormalExcelConstants.CLASS, EamEquipment.class);
+ mv.addObject(NormalExcelConstants.CLASS, EamEquipmentDto.class);
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("璁惧鍙拌处" + "鎶ヨ〃", "瀵煎嚭浜�:" + sysUser.getRealname(), "璁惧鍙拌处"));
- mv.addObject(NormalExcelConstants.DATA_LIST, equipmentList);
+ mv.addObject(NormalExcelConstants.DATA_LIST, eamEquipmentDtos);
return mv;
}
@@ -268,6 +280,13 @@
sb.append(String.format("璁惧缂栫爜[%s]宸插瓨鍦紝鏃犳硶閲嶅瀵煎叆\n\r", eamEquipment.getEquipmentCode()));
continue;
}
+ BaseFactory baseFactory=baseFactoryService.searchCenterByKeyWord(eamEquipment.getFactoryOrgCode());
+ if(baseFactory==null){
+ sb.append(String.format("EAM涓績淇℃伅[%s]涓嶅瓨鍦紝鏃犳硶瀵煎叆\n\r", eamEquipment.getFactoryOrgCode()));
+ continue;
+ }else {
+ eamEquipment.setFactoryOrgCode(baseFactory.getOrgCode());
+ }
EamEquipment equipment = eamEquipmentService.saveEquipment(eamEquipment);
if (equipment == null) {
//淇濆瓨澶辫触锛岃烦杩囨湰娆″惊鐜�
--
Gitblit v1.9.3