From fbf75b40fb739220240e6becff9598c25dac6060 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期三, 10 九月 2025 15:42:53 +0800 Subject: [PATCH] 优化保养规范批量导入,改为返回文件让用户自己查询对应设备型号 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java index a3171aa..fbb9f94 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java @@ -49,8 +49,6 @@ import org.jeecg.modules.system.entity.SysParams; import org.jeecg.modules.system.service.*; import org.jeecg.modules.system.vo.UserSelector; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -1448,14 +1446,13 @@ obsoleteOldVersionsByCompositeKey(deviceVersionMap); if (!notFoundEquipmentCodes.isEmpty()) { - String successMsg = fileName + "閮ㄥ垎瀵煎叆鎴愬姛锛岃澶囨暟锛�" + standards.size() + - "锛岄」鐩暟锛�" + allItems.size(); + String successMsg = fileName + "閮ㄥ垎瀵煎叆鎴愬姛锛岃澶囨暟锛�" + standards.size(); String errorMsg = "浠ヤ笅璁惧缂栫爜鏈壘鍒帮細" + String.join(", ", notFoundEquipmentCodes); return Result.ok(successMsg + "锛涗絾" + errorMsg); } - return Result.ok(fileName + "瀵煎叆鎴愬姛锛岃澶囨暟锛�" + standards.size() + "锛岄」鐩暟锛�" + allItems.size()); - + // 鍙繑鍥炶澶囨暟閲� + return Result.ok(fileName + "瀵煎叆鎴愬姛锛岃澶囨暟锛�" + standards.size()); } catch (ImportException e) { return Result.error(fileName + "锛�" + e.getMessage()); -- Gitblit v1.9.3