From d2cd1865e77dd873166543df2f2f27f183e66860 Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期五, 20 十月 2023 13:56:50 +0800 Subject: [PATCH] 小修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 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 af7bacf..8c06ac4 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 @@ -523,7 +523,8 @@ queryWrapper.in("equipment_status",statusList); IPage<Equipment> pageList = equipmentService.page(page, queryWrapper); return Result.OK(pageList); - }/** + } + /** * 瀵煎叆 * @return */ @@ -705,7 +706,33 @@ .setPropertyStatus(equipmentImportVo.getPropertyStatus()) .setWarrantyStart(equipmentImportVo.getWarrantyStart()) .setWarrantyEnd(equipmentImportVo.getWarrantyEnd()) + .setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime()) .setGpo(equipmentImportVo.getGpo()); + if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){ + equipment.setCheckPeriod(365*3+""); + } + if(equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")){ + equipment.setCheckPeriod(365*4+""); + } + if(equipmentCategory.getEquipmentCategoryUda1().equals("tester")){ + equipment.setCheckPeriod(365*1+""); + } + if( + !equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine") + &&!equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel") + &&!equipmentCategory.getEquipmentCategoryUda1().equals("tester") + ){ + if(equipmentImportVo.getEquipmentImportanceId().equals("A")){ + equipment.setCheckPeriod(365*3+""); + } + if( + equipmentImportVo.getEquipmentImportanceId().equals("B") + ||equipmentImportVo.getEquipmentImportanceId().equals("C") + ||equipmentImportVo.getEquipmentImportanceId().equals("D") + ){ + equipment.setCheckPeriod(365*4+""); + } + } equipmentService.save(equipment); }else { exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐ワ紝鍘熷洜锛氱粺涓�缂栫爜宸插瓨鍦紝鏁版嵁閲嶅瀵煎叆;"; -- Gitblit v1.9.3