“linengliang”
2023-11-08 8c2a5e73b08cddfee3fac4b6e9bf7c70245bcba7
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -571,6 +571,8 @@
                String manageId = equipmentImportVo.getManageId();
                String constructorId = equipmentImportVo.getConstructorId();
                String teamId = equipmentImportVo.getTeamId();
                String propertyStatus = equipmentImportVo.getPropertyStatus();
                String abc = equipmentImportVo.getEquipmentImportanceId();
                     if(StringUtils.isBlank(equipmentImportVo.getNum())){
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:统一编码缺失,请填写必填项后再导入;";
                   exceptionNum++;
@@ -681,7 +683,7 @@
//                }
                else{
                   SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()),false);
                   if(ObjectUtils.isNull(useId)){
                   if(ObjectUtils.isNotNull(use)){
                      equipment.setUseId(use.getId());
                   }else {
                      exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:不存在该使用部门,请维护部门数据后再导入;";
@@ -739,13 +741,14 @@
                         equipment.setConstructorId(constructor.getId());
                      }
                   }
                         if(equipmentImportVo.getPropertyStatus().equals("warranty")){
                         if(StringUtils.isNotBlank(propertyStatus)&&propertyStatus.equals("warranty")){
                      if(
                            ObjectUtils.isNull(equipmentImportVo.getWarrantyStart())
                            ||ObjectUtils.isNull(equipmentImportVo.getWarrantyEnd())
                      ){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:该设备处于质保期,质保信息缺失,请先维护质保开始时间或结束时间;";
                         exceptionNum++;
                         continue;
                      }
                   }else{
@@ -797,16 +800,18 @@
                               &&!equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")
                               &&!equipmentCategory.getEquipmentCategoryUda1().equals("tester")
                         ){
                            if(equipmentImportVo.getEquipmentImportanceId().equals("A")){
                              equipment.setCheckPeriod(365*3+"");
                            if(StringUtils.isNotBlank(abc)){
                              if(abc.equals("A")){
                                 equipment.setCheckPeriod(365*3+"");
                              }
                              if(
                                    abc.equals("B")
                                          ||abc.equals("C")
                                          ||abc.equals("D")
                              ){
                                 equipment.setCheckPeriod(365*4+"");
                              }
                           }
                            if(
                                  equipmentImportVo.getEquipmentImportanceId().equals("B")
                                 ||equipmentImportVo.getEquipmentImportanceId().equals("C")
                                 ||equipmentImportVo.getEquipmentImportanceId().equals("D")
                           ){
                               equipment.setCheckPeriod(365*4+"");
                            }
                         }
                         equipmentService.save(equipment);
                      }else {