From 51ebb09a85d622cae75dc169b4c86723977d3756 Mon Sep 17 00:00:00 2001
From: yangkang <yangkang@xalxzn.com>
Date: 星期三, 13 九月 2023 15:39:48 +0800
Subject: [PATCH] 预测维护修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 121 ++++++++++++++++++++++++++--------------
1 files changed, 78 insertions(+), 43 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 9bceb45..8418ba5 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
@@ -192,6 +192,12 @@
return Result.OK(pageList);
}
+ @GetMapping(value = "/pageEquipment")
+ public Result<IPage<Equipment>> pageEquipment(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
+ IPage<Equipment> pageList = equipmentService.pageEquipment(pageNo, pageSize, params);
+ return Result.OK(pageList);
+ }
+
/**
* 娣诲姞
*
@@ -577,8 +583,20 @@
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鎶�鏈己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
}
- else if(StringUtils.isBlank(equipmentImportVo.getKeyEquipmentIdentification())){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍏抽敭璁惧鏍囪瘑缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ else if(StringUtils.isBlank(equipmentImportVo.getFactoryModelId())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:杞﹂棿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getWorkCenterId())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:浜х嚎缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(ObjectUtils.isNotNull(equipmentImportVo.getWarrantyStart())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璐ㄤ繚寮�濮嬫棩鏈熺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getPropertyStatus())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璧勪骇鐘舵�佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
}
//闈炲繀濉」
@@ -635,48 +653,65 @@
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璇ヨ澶囨墍灞炵被鍒笉瀛樺湪锛岃鍏堢淮鎶よ澶囩被鍒�;";
exceptionNum++;
}
- else{
- Equipment oriEquipment = equipmentService.getOne(new QueryWrapper<Equipment>().eq("num",equipmentImportVo.getNum()),false);
- if(ObjectUtils.isNull(oriEquipment)){
- Equipment equipment = new Equipment();
- equipment.setNum(equipmentImportVo.getNum())
- .setName(equipmentImportVo.getName())
- .setUseId(equipmentImportVo.getUseId())
- .setEquipmentUda1(equipmentImportVo.getEquipmentUda1())
- .setManageId(equipmentImportVo.getManageId())
- .setTeamId(equipmentImportVo.getTeamId())
- .setTechnologyStatus(equipmentImportVo.getTechnologyStatus())
- .setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
- .setEquipmentCategoryId(equipmentCategory.getId())
- .setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification())
- .setSecurityConfiguration(equipmentImportVo.getSecurityConfiguration())
- .setCoolingSystem(equipmentImportVo.getCoolingSystem())
- .setFireExtinguisher(equipmentImportVo.getFireExtinguisher())
- .setFireExtinguisherValidityPeriod(equipmentImportVo.getFireExtinguisherValidityPeriod())
- .setOperatingSystem(equipmentImportVo.getOperatingSystem())
- .setSystem(equipmentImportVo.getSystem())
- .setPort(equipmentImportVo.getPort())
- .setCoordinateNum(equipmentImportVo.getCoordinateNum())
- .setEquipmentStatus(equipmentImportVo.getEquipmentStatus())
- .setEquipmentUda3(equipmentImportVo.getEquipmentUda3())
- .setEquipmentUda4(equipmentImportVo.getEquipmentUda4())
- .setEquipmentUda5(equipmentImportVo.getEquipmentUda5())
- .setLocation(equipmentImportVo.getLocation())
- .setLastVerificationDate(equipmentImportVo.getLeaveFactoryDate())
- .setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo())
- .setFundSource(equipmentImportVo.getFundSource())
- .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
- .setFactoryNumber(equipmentImportVo.getFactoryNumber())
- .setConstructorId(equipmentImportVo.getConstructorId())
- .setSourceCountry(equipmentImportVo.getSourceCountry())
- .setModel(equipmentImportVo.getModel())
- .setSpecification(equipmentImportVo.getSpecification())
- .setGpo(equipmentImportVo.getGpo());
- equipmentService.save(equipment);
- }else {
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐ワ紝鍘熷洜锛氱粺涓�缂栫爜宸插瓨鍦紝鏁版嵁閲嶅瀵煎叆;";
- exceptionNum++;
+ else{
+ if(equipmentImportVo.getPropertyStatus().equals("warranty")){
+ if(
+ ObjectUtils.isNull(equipmentImportVo.getWarrantyStart())
+ ||ObjectUtils.isNull(equipmentImportVo.getWarrantyEnd())
+ ){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璇ヨ澶囧浜庤川淇濇湡锛岃川淇濅俊鎭己澶憋紝璇峰厛缁存姢璐ㄤ繚寮�濮嬫椂闂存垨缁撴潫鏃堕棿;";
+ exceptionNum++;
+ }
+
+ }else{
+ Equipment oriEquipment = equipmentService.getOne(new QueryWrapper<Equipment>().eq("num",equipmentImportVo.getNum()),false);
+ if(ObjectUtils.isNull(oriEquipment)){
+ Equipment equipment = new Equipment();
+ equipment.setNum(equipmentImportVo.getNum())
+ .setName(equipmentImportVo.getName())
+ .setUseId(equipmentImportVo.getUseId())
+ .setEquipmentUda1(equipmentImportVo.getEquipmentUda1())
+ .setManageId(equipmentImportVo.getManageId())
+ .setTeamId(equipmentImportVo.getTeamId())
+ .setTechnologyStatus(equipmentImportVo.getTechnologyStatus())
+ .setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
+ .setEquipmentCategoryId(equipmentCategory.getId())
+ .setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification())
+ .setSecurityConfiguration(equipmentImportVo.getSecurityConfiguration())
+ .setCoolingSystem(equipmentImportVo.getCoolingSystem())
+ .setFireExtinguisher(equipmentImportVo.getFireExtinguisher())
+ .setFireExtinguisherValidityPeriod(equipmentImportVo.getFireExtinguisherValidityPeriod())
+ .setOperatingSystem(equipmentImportVo.getOperatingSystem())
+ .setSystem(equipmentImportVo.getSystem())
+ .setPort(equipmentImportVo.getPort())
+ .setCoordinateNum(equipmentImportVo.getCoordinateNum())
+ .setEquipmentStatus(equipmentImportVo.getEquipmentStatus())
+ .setEquipmentUda3(equipmentImportVo.getEquipmentUda3())
+ .setEquipmentUda4(equipmentImportVo.getEquipmentUda4())
+ .setEquipmentUda5(equipmentImportVo.getEquipmentUda5())
+ .setLocation(equipmentImportVo.getLocation())
+ .setLastVerificationDate(equipmentImportVo.getLeaveFactoryDate())
+ .setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo())
+ .setFundSource(equipmentImportVo.getFundSource())
+ .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
+ .setFactoryNumber(equipmentImportVo.getFactoryNumber())
+ .setConstructorId(equipmentImportVo.getConstructorId())
+ .setSourceCountry(equipmentImportVo.getSourceCountry())
+ .setModel(equipmentImportVo.getModel())
+ .setSpecification(equipmentImportVo.getSpecification())
+ .setFactoryModelId(equipmentImportVo.getFactoryModelId())
+ .setWorkCenterId(equipmentImportVo.getWorkCenterId())
+ .setPropertyStatus(equipmentImportVo.getPropertyStatus())
+ .setWarrantyStart(equipmentImportVo.getWarrantyStart())
+ .setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
+ .setGpo(equipmentImportVo.getGpo());
+ equipmentService.save(equipment);
+ }else {
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐ワ紝鍘熷洜锛氱粺涓�缂栫爜宸插瓨鍦紝鏁版嵁閲嶅瀵煎叆;";
+ exceptionNum++;
+ }
}
+
}
}
if(exceptionNum!=0){
--
Gitblit v1.9.3