From 67ac603f410319a0d999e5f493c8ef2d74163fe1 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 15 九月 2025 19:44:47 +0800
Subject: [PATCH] 保养标准:点检标准导入 点检名称修改/ 设备台账导入

---
 src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
index a9025c6..a9913c1 100644
--- a/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
+++ b/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
@@ -324,7 +324,7 @@
                     continue;
                 }
 
-                standardRequest.setStandardName(standardRequest.getEquipmentName() + "鐐规鏍囧噯");
+                standardRequest.setStandardName(equipment.getEquipmentName() + "鐐规鏍囧噯");
                 standardRequest.setMaintenanceCategory(MaintenanceCategoryEnum.POINT_INSPECTION.name());
                 standardRequest.setEquipmentId(equipment.getId());
 
@@ -519,11 +519,6 @@
                 throw new JeecgBootException("Excel銆�" + file.getOriginalFilename() + "銆戠浜岃绗竴鍒楄幏鍙栧埌鐨勮澶囩紪鍙蜂负绌猴紒");
             }
             request.setFileCode(fileCodeValue.trim());
-//            if(CellType.NUMERIC.equals(equipmentCode.getCellType())) {
-//                request.setEquipmentCode(String.valueOf((int) equipmentCode.getNumericCellValue()));
-//            }else if(CellType.STRING.equals(equipmentCode.getCellType())) {
-//                request.setEquipmentCode(equipmentCode.getStringCellValue());
-//            }
             String equipmentCodeStr = extractEquipmentCode(equipmentCode);
             if (StringUtils.isBlank(equipmentCodeStr)) {
                 throw new JeecgBootException("Excel銆� " + file.getOriginalFilename() + "銆戞病鏈夎鍙栧埌鏈夋晥鐨勮澶囩紪鍙凤紝瀵煎叆澶辫触锛�");
@@ -539,11 +534,6 @@
             } else {
                 request.setInitialDate(new Date());
             }
-            //璁惧鍚嶇О
-//            Cell equipmentName = row.getCell(13);
-//            request.setEquipmentName(equipmentName.getStringCellValue());
-
-
             row = sheet.getRow(4);
             //淇濆吇鍛ㄦ湡
             Cell period = row.getCell(7);

--
Gitblit v1.9.3