diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index 641dd8e..8ebebe7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -415,6 +415,7 @@ dictTotalMap.put(MeterDictCode.EQUIPMENT_METER_IDENTITY, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_METER_IDENTITY)); dictTotalMap.put(MeterDictCode.EQUIPMENT_IN_USE, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_IN_USE)); dictTotalMap.put(MeterDictCode.EQUIPMENT_QUALITY, dictService.findInDictByCode(MeterDictCode.EQUIPMENT_QUALITY)); + dictTotalMap.put(MeterDictCode.EQUIPMENT_CHECK_DESTINATION,dictService.findInDictByCode(MeterDictCode.EQUIPMENT_CHECK_DESTINATION)); Long companyId = null; List parentDeptIds = permissionContext.getDeptService().getParentListById(user.getDeptId()); @@ -621,6 +622,9 @@ public void filledImport(List list){ List companyIds = list.stream().filter(i->StrUtil.isBlank(i.getCheckDestination())).map(EquipmentImportDTO::getCompanyId).distinct().collect(Collectors.toList()); + if(CollUtil.isEmpty(companyIds)){ + return; + } List modelIds = list.stream().filter(i->StrUtil.isBlank(i.getCheckDestination())).map(EquipmentImportDTO::getModelId).distinct().collect(Collectors.toList()); Map defaultLabMap = getDefaultLabMap(companyIds); List modelInfos = modelInfoService.list(new QueryWrapper().in("id",modelIds)); @@ -647,7 +651,11 @@ EquipmentInfo equipmentInfo = new EquipmentInfo(); BeanUtil.copyProperties(importDTO, equipmentInfo); equipmentInfo.setId(IdWorker.getId()); - equipmentInfo.setEquipmentNo(NumberGeneratorUtil.getContactNo(prefix, maxNo + i)); + + String equipmentNo = NumberGeneratorUtil.getContactNo(prefix, maxNo); + equipmentInfo.setEquipmentNo(equipmentNo); + maxNo = Long.parseLong(equipmentNo.substring(equipmentNo.length() - 12)); +// equipmentInfo.setEquipmentNo(NumberGeneratorUtil.getContactNo(prefix, maxNo + i)); // equipmentInfo.setEquipmentType(equipmentType); equipmentInfo.setCreateUserId(user.getId()); equipmentInfo.setCreateUserName(user.getName());