From 21757cce51c4b03db6b586ca4c8ffb1dec76235d Mon Sep 17 00:00:00 2001
From: qinyulong <yulong.qin@ceict.com.cn>
Date: Mon, 20 Apr 2026 19:10:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=AE=BE=E5=A4=87=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6-=E5=AF=BC=E5=85=A5/=E7=BB=B4=E6=8A=A4=E6=97=B6?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EquipmentMaintenanceServiceImpl.java |  27 +++++++++++-------
 .../jobTransfer/设备维护导入模板.xls  | Bin 20480 -> 20480 bytes
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java
index aecae90b..09a52968 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java
@@ -110,23 +110,28 @@ public class EquipmentMaintenanceServiceImpl extends BaseServiceImpl<EquipmentMa
             return R.fail("工号:" + String.join(",", codes) + "不存在。");
         }
         //查询设备信息
-        Set<String> deviceCode = importList.stream().map(EquipmentMaintenanceImport::getDeviceCode)
+        Set<String> deviceCode = importList.stream()
+                .map(EquipmentMaintenanceImport::getDeviceCode)
+                .filter(code -> code != null && !code.trim().isEmpty())
                 .collect(Collectors.toSet());
-        LambdaQueryWrapper<EquipmentEntity> equipmentEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        equipmentEntityLambdaQueryWrapper.in(CollectionUtils.isNotEmpty(deviceCode), EquipmentEntity::getDeviceCode, deviceCode); // [8](@ref)
-        List<EquipmentEntity> equipmentEntities = equipmentMapper.selectList(equipmentEntityLambdaQueryWrapper);
-        Map<String, Long> deviceNameIds = equipmentEntities.stream().collect(Collectors.toMap(
-                entity -> entity.getDeviceCode(),
-                entity -> entity.getId()));
-        deviceCode.removeAll(deviceNameIds.keySet());
-        if (deviceCode.size() > 0) {
-            return R.fail("设备:" + String.join(",", deviceCode) + "不存在。");
+        Map<String, Long> deviceNameIds;
+        if (null != deviceCode && deviceCode.size() > 0) {
+            LambdaQueryWrapper<EquipmentEntity> equipmentEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            equipmentEntityLambdaQueryWrapper.in(CollectionUtils.isNotEmpty(deviceCode), EquipmentEntity::getDeviceCode, deviceCode); // [8](@ref)
+            List<EquipmentEntity> equipmentEntities = equipmentMapper.selectList(equipmentEntityLambdaQueryWrapper);
+            deviceNameIds = equipmentEntities.stream().collect(Collectors.toMap(
+                    entity -> entity.getDeviceCode(),
+                    entity -> entity.getId()));
+        } else {
+            deviceNameIds = new HashMap<>();
         }
         List<EquipmentMaintenanceEntity> saves = new ArrayList<>();
         importList.forEach(e -> {
             EquipmentMaintenanceEntity entity = new EquipmentMaintenanceEntity();
             entity.setPhId(codePostHandleIdMap.get(e.getUserCode()));
-            entity.setEquipmentId(deviceNameIds.get(e.getDeviceCode()));
+            if (e.getDeviceCode() != null && !e.getDeviceCode().trim().isEmpty()) {
+                entity.setEquipmentId(deviceNameIds.get(e.getDeviceCode()));
+            }
             entity.setEquipmentDate(e.getEquipmentDate());
             entity.setEquipmentValidityPeriod(e.getEquipmentValidityPeriod());
             entity.setMaintenanceStatus(MaintenanceStatusEnum.NORMAL.getCode().shortValue());
diff --git a/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/设备维护导入模板.xls b/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/设备维护导入模板.xls
index a49665048f6344e72f015fb6c22aeaa45d670235..888ca2c54f0b1478abc3222ff9f1957306a80024 100644
GIT binary patch
delta 502
zcmZozz}T>WaYGIZTYyWW;?@h3i&)y26zn(uVrgRIWT<ck3f*C3o_x{Edh-G9SVqQa
zljV5DfutXdl$^%I*c~10Z^$6Ru!Vtv;eY)EMj*w|Hf?epuQ*87vwD9WNcIj;l#>B2
zyAD-Whmn!NjA0KGRPQ}h**gp<vV44KCbKZ`fK6ru*=vU`%gDfiFgXuXmJ=a64_%gl
zfeYd0bC|L=2-$y_vUUhrJ$_KQ0mB4H#(~(I%lKb#O#UY>CdH{x!y&>@!vXR;40tkB
z^c$3JE|XXwIQgH35TnQBKuvi*sO<m$XZ~BqD{L0i5))*yu$io9{ekh(W_g>Z+^l}K
j3=AooIXzZ00<~=QoWTQ%4RDMwFfwkA^zvt1<ii30oHu^H

delta 475
zcmZozz}T>WaYGIZ+XtsRQ(tyWE@Ek8I$^i@7fTZxXG2IXQ0NXL^JGPD>&*waV;LE>
zC(H4Q14%y^DXGoG*c~10Z^$6Ru!Vtv;eY)EMj*w|raifiR~#hkS-rmwBzp%a%E<ti
zU56^G!^p^B#;}J8s`nnM>>UOaSw22AlUW#ez$P<-?6pIeWn|z$n4E_x%ZZSkhc3&&
zz=d%0IZRm_gzP^|Sv!QR9zQ7DfMEh8<3Q}qW&AHVBx*QB7-~2`zJ>u0hTQD@rp<j4
z3j{akX^9CkJ+PkKX8nP&Yje5HQ*PF8HVh0rn-e`&Gcr0)=JlGv0}3*5kTWnbZQkhR
N&p6q@J7SR!3jkweZ=?VK