From 04ef88cee361ec8730c400d96250a6c1cd9f9d80 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 08 九月 2023 16:23:47 +0800
Subject: [PATCH] 设备台账 1.ABC标识变更记录功能 2.质保日期变更记录功能 3.质保到期提醒 4.ABC标识与关键设备标识联动 5.设备质保期字段添加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 259 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 178 insertions(+), 81 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 deb81e9..4d588b7 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
@@ -73,8 +73,7 @@
@Autowired
private IProcessParametersTemplateService processParametersTemplateService;
-// @Autowired
-// private IUploadRelaService uploadRelaService;
+
@Autowired
private ISysBaseAPI sysBaseApi;
@@ -153,17 +152,17 @@
eq.setPrecisionParametersTemplateName("");
}
-// String processParametersTemplateId = eq.getProcessParametersTemplateId();
-// if(StringUtils.isNotBlank(processParametersTemplateId)){
-// ProcessParametersTemplate processParametersTemplate = processParametersTemplateService.getById(processParametersTemplateId);
-// if(processParametersTemplate != null){
-// eq.setProcessParametersTemplateName(processParametersTemplate.getName());
-// }else{
-// eq.setProcessParametersTemplateName("");
-// }
-// }else{
-// eq.setProcessParametersTemplateName("");
-// }
+ String processParametersTemplateId = eq.getProcessParametersTemplateId();
+ if(StringUtils.isNotBlank(processParametersTemplateId)){
+ ProcessParametersTemplate processParametersTemplate = processParametersTemplateService.getById(processParametersTemplateId);
+ if(processParametersTemplate != null){
+ eq.setProcessParametersTemplateName(processParametersTemplate.getName());
+ }else{
+ eq.setProcessParametersTemplateName("");
+ }
+ }else{
+ eq.setProcessParametersTemplateName("");
+ }
//鏌ヨ灏佸瓨鍘熷洜鍜屽皝瀛樻棩鏈�
List<EquipmentSealDetail> equipmentSealDetailList = equipmentSealDetailService.lambdaQuery().eq(EquipmentSealDetail::getEquipmentId,eq.getId())
.eq(EquipmentSealDetail::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(EquipmentSealDetail::getCreateTime).list();
@@ -186,6 +185,8 @@
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
+ queryWrapper.eq("status","1");
+ queryWrapper.eq("del_flag",0);
Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
return Result.OK(pageList);
@@ -357,7 +358,7 @@
//@RequiresPermissions("org.jeecg.modules.demo:mom_eam_equipment:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, Equipment equipment) {
- return super.exportXls(request, equipment, Equipment.class, "mom_eam_equipment");
+ return super.exportXls(request, equipment, Equipment.class, "璁惧鍙拌处瀵煎嚭");
}
// /**
@@ -536,79 +537,175 @@
for(int i = 0;i<list.size();i++){
EquipmentImportVo equipmentImportVo = list.get(i);
EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(new QueryWrapper<EquipmentCategory>().eq("name",equipmentImportVo.getEquipmentCategoryName()),false);
- if(
- StringUtils.isBlank(equipmentImportVo.getNum())
- || StringUtils.isBlank(equipmentImportVo.getName())
- || StringUtils.isBlank(equipmentImportVo.getUseId())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentUda1())
- || StringUtils.isBlank(equipmentImportVo.getManageId())
- || StringUtils.isBlank(equipmentImportVo.getTeamId())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentCategoryName())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentStatus())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentUda3())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentUda5())
- || StringUtils.isBlank(equipmentImportVo.getEquipmentUda2())
- || StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())
- || StringUtils.isBlank(equipmentImportVo.getProjectApprovalNo())
- || StringUtils.isBlank(equipmentImportVo.getFundSource())
- || StringUtils.isBlank(equipmentImportVo.getAcceptanceCheckDate())
- || StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())
- || StringUtils.isBlank(equipmentImportVo.getFactoryNo())
- || StringUtils.isBlank(equipmentImportVo.getConstructorId())
- || StringUtils.isBlank(equipmentImportVo.getSourceCountry())
- || StringUtils.isBlank(equipmentImportVo.getModel())
- || StringUtils.isBlank(equipmentImportVo.getSpecification())
- || StringUtils.isBlank(equipmentImportVo.getGpo())
- ){
- exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鏁版嵁鏈夋湭濉」,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ if(StringUtils.isBlank(equipmentImportVo.getNum())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁熶竴缂栫爜缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
- }else if(ObjectUtils.isNull(equipmentCategory))
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getName())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍚嶇О缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getUseId())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:浣跨敤閮ㄩ棬缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+// else if(StringUtils.isBlank(equipmentImportVo.getEquipmentUda1())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:宸ュ尯缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+ else if(StringUtils.isBlank(equipmentImportVo.getManageId())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁存姢閮ㄩ棬缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getTeamId())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁翠慨鐝粍缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:ABC鏍囪瘑缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getEquipmentCategoryName())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍒嗙被缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getEquipmentStatus())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鐘舵�佺己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getTechnologyStatus())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鎶�鏈己澶�,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ 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++;
+ }
+ //闈炲繀濉」
+// else if(StringUtils.isBlank(equipmentImportVo.getEquipmentUda5())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍔熻兘浣嶇疆缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getLocation())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:瀹夎浣嶇疆缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍑哄巶鏃ユ湡缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getProjectApprovalNo())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:绔嬮」鍗″彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getFundSource())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璧勯噾鏉ユ簮缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getAcceptanceCheckDate())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:楠屾敹鏃ユ湡缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍑哄巶鏃ユ湡缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if(StringUtils.isBlank(equipmentImportVo.getFactoryNo())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:鍑哄巶缂栧彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+// else if( StringUtils.isBlank(equipmentImportVo.getConstructorId())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璧勪骇鍒堕�犲晢缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+ else if(StringUtils.isBlank(equipmentImportVo.getModel())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍨嬪彿缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+ else if(StringUtils.isBlank(equipmentImportVo.getSpecification())){
+ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧瑙勬牸缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+ exceptionNum++;
+ }
+// else if(StringUtils.isBlank(equipmentImportVo.getGpo())){
+// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍔熺巼缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
+// exceptionNum++;
+// }
+ else if(ObjectUtils.isNull(equipmentCategory))
{
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())
- .setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
- .setEquipmentCategoryId(equipmentCategory.getId())
- .setKeyEquipmentIdentification(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())
- .setEquipmentUda2(equipmentImportVo.getEquipmentUda2())
- .setLastVerificationDate(equipmentImportVo.getLeaveFactoryDate())
- .setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo())
- .setFundSource(equipmentImportVo.getFundSource())
- .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
- .setFactoryNo(equipmentImportVo.getFactoryNo())
- .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