From 8c2a5e73b08cddfee3fac4b6e9bf7c70245bcba7 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 08 十一月 2023 14:15:21 +0800
Subject: [PATCH] 设备台账导入优化
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 22 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 dce198e..82adf2e 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
@@ -549,6 +549,7 @@
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@Transactional(rollbackFor = Exception.class)
+ //宸ュ尯銆佸瀷鍙枫�佽澶囩姸鎬併�佹妧鏈姸鎬併�丄BC鏍囪瘑鏈夌┖鍊硷紱缁存姢閮ㄩ棬銆佺淮淇彮缁勪负缂栫爜闇�瑕佹湁瀵圭収鍊笺��
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -570,6 +571,8 @@
String manageId = equipmentImportVo.getManageId();
String constructorId = equipmentImportVo.getConstructorId();
String teamId = equipmentImportVo.getTeamId();
+ String propertyStatus = equipmentImportVo.getPropertyStatus();
+ String abc = equipmentImportVo.getEquipmentImportanceId();
if(StringUtils.isBlank(equipmentImportVo.getNum())){
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁熶竴缂栫爜缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
@@ -580,23 +583,18 @@
exceptionNum++;
continue;
}
- else if(StringUtils.isBlank(equipmentImportVo.getTeamId())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁翠慨鐝粍缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
- else if(StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:ABC鏍囪瘑缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
- exceptionNum++;
- continue;
- }
+// else if(StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:ABC鏍囪瘑缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// continue;
+// }
else if(StringUtils.isBlank(equipmentImportVo.getEquipmentStatus())){
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鐘舵�佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
continue;
}
else if(StringUtils.isBlank(equipmentImportVo.getTechnologyStatus())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鎶�鏈姸鎬佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鎶�鏈姸鎬佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
continue;
}
@@ -685,7 +683,7 @@
// }
else{
SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()),false);
- if(ObjectUtils.isNull(useId)){
+ if(ObjectUtils.isNotNull(use)){
equipment.setUseId(use.getId());
}else {
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ浣跨敤閮ㄩ棬,璇风淮鎶ら儴闂ㄦ暟鎹悗鍐嶅鍏�;";
@@ -693,8 +691,11 @@
continue;
}
Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()));
+ Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()));
if(ObjectUtils.isNotNull(area)){
equipment.setFactoryModelId(area.getId());
+ }else if(ObjectUtils.isNotNull(area1)) {
+ equipment.setFactoryModelId(area1.getId());
}else {
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ宸ュ尯,璇风淮鎶ゅ伐鍖烘暟鎹悗鍐嶅鍏�;";
exceptionNum++;
@@ -718,8 +719,11 @@
continue;
}
Team team = teamService.getOne(new QueryWrapper<Team>().eq("name",teamId.trim()),false);
+ Team team1 = teamService.getOne(new QueryWrapper<Team>().eq("num",teamId.trim()),false);
if(ObjectUtils.isNotNull(team)){
equipment.setTeamId(team.getId());
+ }else if(ObjectUtils.isNotNull(team1)) {
+ equipment.setTeamId(team1.getId());
}else {
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ鐝粍,璇峰厛缁存姢鐝粍鏁版嵁鍚庡啀瀵煎叆;";
exceptionNum++;
@@ -737,13 +741,14 @@
equipment.setConstructorId(constructor.getId());
}
}
- if(equipmentImportVo.getPropertyStatus().equals("warranty")){
+ if(StringUtils.isNotBlank(propertyStatus)&&propertyStatus.equals("warranty")){
if(
ObjectUtils.isNull(equipmentImportVo.getWarrantyStart())
||ObjectUtils.isNull(equipmentImportVo.getWarrantyEnd())
){
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璇ヨ澶囧浜庤川淇濇湡锛岃川淇濅俊鎭己澶憋紝璇峰厛缁存姢璐ㄤ繚寮�濮嬫椂闂存垨缁撴潫鏃堕棿;";
exceptionNum++;
+ continue;
}
}else{
@@ -795,16 +800,18 @@
&&!equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")
&&!equipmentCategory.getEquipmentCategoryUda1().equals("tester")
){
- if(equipmentImportVo.getEquipmentImportanceId().equals("A")){
- equipment.setCheckPeriod(365*3+"");
+ if(StringUtils.isNotBlank(abc)){
+ if(abc.equals("A")){
+ equipment.setCheckPeriod(365*3+"");
+ }
+ if(
+ abc.equals("B")
+ ||abc.equals("C")
+ ||abc.equals("D")
+ ){
+ equipment.setCheckPeriod(365*4+"");
+ }
}
- if(
- equipmentImportVo.getEquipmentImportanceId().equals("B")
- ||equipmentImportVo.getEquipmentImportanceId().equals("C")
- ||equipmentImportVo.getEquipmentImportanceId().equals("D")
- ){
- equipment.setCheckPeriod(365*4+"");
- }
}
equipmentService.save(equipment);
}else {
--
Gitblit v1.9.3