فهرست منبع

巡检工单在巡检项删掉之后的逻辑处理

Zimo 2 روز پیش
والد
کامیت
b10b7fb413

+ 6 - 2
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectOrderServiceImpl.java

@@ -264,7 +264,7 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
             List<IotInspectItemDO> items = iotInspectItemMapper.selectList();
             v.forEach(routeDO -> {
                 List<Map> itemos = JSON.parseArray(routeDO.getItemJson(), Map.class);
-                itemos.forEach(item -> {
+                for (Map item : itemos) {
                     Long deviceId = routeDO.getDeviceId();
                     IotDeviceDO deviceDO = iotDeviceMapper.selectById(deviceId);
                     if (Objects.nonNull(deviceDO)&&"sg".equals(deviceDO.getDeviceStatus())){
@@ -287,6 +287,10 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
                                 detailDO.setUrls(iotItem.getUrls());
                                 detailDO.setItem(iotItem.getItem());
                             });
+                            //没有巡检项的话直接不生成
+                            if (StringUtils.isBlank(detailDO.getStandard())){
+                                continue;
+                            }
                             IotDeviceDO iotDeviceDO = iotDeviceMapper.selectById(routeDO.getDeviceId());
                             if (Objects.nonNull(iotDeviceDO)){
                                 detailDO.setDeptId(iotDeviceDO.getDeptId());
@@ -297,7 +301,7 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
                             results.add(detailDO);
                         }
                     }
-                });
+                }
             });
             if (CollUtil.isEmpty(results)){
                 return;