lyh
14 小时以前 fbf75b40fb739220240e6becff9598c25dac6060
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());