修改巡检服务方法

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/LatentDangerServiceImpl.java

@@ -1636,10 +1636,11 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         Long checkId = param.getLong("checkId");
         Long itemId = param.getLong("itemId");
         Long routePointItemId = param.getLong("routePointItemId");
+        Long checkInputId = param.getLong("checkInputId");
         Integer checkType = null;
 
         Check check = getCheck(checkId);
-        InputCheckDto inputCheckDto = getInputCheckDto(checkId, itemId, routePointItemId);
+        InputCheckDto inputCheckDto = getInputCheckDto(check, itemId, routePointItemId, checkInputId);
         InputItem inputItem = getInputItem(itemId);
         String photoUrls = getPhotoUrls(inputCheckDto);
         
@@ -1665,12 +1666,18 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         return check;
     }
 
-    private InputCheckDto getInputCheckDto(Long checkId, Long itemId, Long routePointItemId) {
+    private InputCheckDto getInputCheckDto(Check check, Long itemId, Long routePointItemId, Long checkInputId) {
         if (ValidationUtil.isEmpty(itemId) || ValidationUtil.isEmpty(routePointItemId)) {
             return null;
         }
-        InputCheckDto inputCheckDto = checkInputMapper.getByCheckIdAndItemIdAndRoutePointItemId(checkId,
+        InputCheckDto inputCheckDto = checkInputMapper.getByCheckIdAndItemIdAndRoutePointItemId(check.getId(),
                 itemId, routePointItemId, null);
+        if (CheckModeEnum.WEB_OUT.getCode().equals(check.getCheckMode())) {
+            // 如果是外来检查，这里itemList里面无法区分InputCheckDto...
+            // 在LatentDangerPatrolItemParam中增加checkInputId字段来区分
+            inputCheckDto = checkInputMapper.getByCheckIdAndItemIdAndRoutePointItemId(null, null,
+                    null, checkInputId);
+        }
         return inputCheckDto;
     }