提交

qushaowei

2024-03-28 7f2d8230bd6bb29dc18e91a843018113cd6eb4c0

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java

@@ -336,6 +336,7 @@
        LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        String exceptionInfo = "";
        String msgInfo = "";
        int exceptionNum = 0;
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            MultipartFile file = entity.getValue();
@@ -375,10 +376,12 @@
                                            maintenanceStandardService.save(maintenanceStandard);
                                        }
                                        else {
                                            msgInfo += equipment.getNum()+ ",";
                                            continue;
                                        }
                                    }
                                    else {

                                        continue;
                                    }
                                }
@@ -475,6 +478,7 @@
                                            maintenanceStandardService.save(maintenanceStandard);
                                        }
                                        else {
                                            msgInfo += equipment.getNum()+ ",";
                                            continue;
                                        }
                                    }
@@ -527,7 +531,11 @@
                            }
                        }
                    }
                    return Result.OK("导入成功");
                    if(msgInfo == ""){
                        return Result.OK("导入成功");
                    }else{
                        return Result.OK("统一编码是："+msgInfo+"的保养标准已存在，请先手动失效再重新导入!");
                    }
                } else {
                    System.out.println("无法解析该文件");
                }