保养标准导入

“linengliang”

2023-12-04 12bfd8a94f5b5afe8c149e8de7e275a81a4bf77e

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

@@ -684,7 +684,7 @@
//                   exceptionNum++;
//                }
                else{
                   SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()),false);
                   SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()).eq("del_flag",0),false);
                   if(ObjectUtils.isNotNull(use)){
                      equipment.setUseId(use.getId());
                   }else {
@@ -692,8 +692,8 @@
                      exceptionNum++;
                      continue;
                   }
                   Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()));
                   Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()));
                   Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()).eq("del_flag",0));
                   Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()).eq("del_flag",0));
                   if(ObjectUtils.isNotNull(area)){
                      equipment.setFactoryModelId(area.getId());
                   }else if(ObjectUtils.isNotNull(area1)) {
@@ -703,7 +703,7 @@
                      exceptionNum++;
                      continue;
                   }
                   SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()));
                   SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()).eq("del_flag",0));
                   if(ObjectUtils.isNotNull(manage)){
                      equipment.setManageId(manage.getId());
                   }else{
@@ -711,7 +711,9 @@
                      exceptionNum++;
                      continue;
                   }
                   EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(new QueryWrapper<EquipmentCategory>().eq("name",equipmentCategoryName.trim()),false);
                   EquipmentCategory equipmentCategory = equipmentCategoryService
                         .getOne(new QueryWrapper<EquipmentCategory>()
                               .eq("name",equipmentCategoryName.trim()).eq("del_flag",0),false);
                   if(ObjectUtils.isNotNull(equipmentCategory)){
                      equipment.setEquipmentCategoryId(equipmentCategory.getId());
                   }
@@ -720,8 +722,8 @@
                      exceptionNum++;
                      continue;
                   }
                   Team team = teamService.getOne(new QueryWrapper<Team>().eq("name",teamId.trim()),false);
                   Team team1 = teamService.getOne(new QueryWrapper<Team>().eq("num",teamId.trim()),false);
                   Team team = teamService.getOne(new QueryWrapper<Team>().eq("name",teamId.trim()).eq("del_flag",0),false);
                   Team team1 = teamService.getOne(new QueryWrapper<Team>().eq("num",teamId.trim()).eq("del_flag",0),false);
                   if(ObjectUtils.isNotNull(team)){
                      equipment.setTeamId(team.getId());
                   }else if(ObjectUtils.isNotNull(team1)) {
@@ -756,7 +758,7 @@
                   }else{
                      Equipment oriEquipment = equipmentService
                            .getOne(new QueryWrapper<Equipment>()
                                  .eq("num",equipmentImportVo.getNum()),false);
                                  .eq("num",equipmentImportVo.getNum()).eq("del_flag",0),false);
                      if(ObjectUtils.isNull(oriEquipment)){
                         equipment.setNum(equipmentImportVo.getNum())
                               .setName(equipmentImportVo.getName())