联调设备巡检记录

@@ -42,7 +42,8 @@ public class TkInspectionRecordController extends BaseController {
             @RequestParam(value = "inspectorId", required = false) String inspectorId,
             @RequestParam(value = "inspectorId", required = false) String inspectorId,
             @RequestParam(value = "startTime", required = false) Long startTime,
             @RequestParam(value = "startTime", required = false) Long startTime,
             @RequestParam(value = "endTime", required = false) Long endTime,
             @RequestParam(value = "endTime", required = false) Long endTime,
-            @RequestParam(value = "recordResult", required = false) Boolean recordResult
+            @RequestParam(value = "recordResult", required = false) Boolean recordResult,
+            @RequestParam(value = "deviceId", required = false) String deviceId
     ) throws ThingsboardException {
     ) throws ThingsboardException {
         Map<String, Object> queryMap = new HashMap<>();
         Map<String, Object> queryMap = new HashMap<>();
         queryMap.put(PAGE_SIZE, pageSize);
         queryMap.put(PAGE_SIZE, pageSize);
@@ -63,6 +64,10 @@ public class TkInspectionRecordController extends BaseController {
             queryMap.put("recordResult", recordResult);
             queryMap.put("recordResult", recordResult);
         }
         }
 
 
+        if (recordResult != null) {
+            queryMap.put("deviceId", deviceId);
+        }
+
         checkTimeAndPut(queryMap, startTime, endTime);
         checkTimeAndPut(queryMap, startTime, endTime);
         return tkInspectionRecordService.page(queryMap, getCurrentUser().getCurrentTenantId());
         return tkInspectionRecordService.page(queryMap, getCurrentUser().getCurrentTenantId());
     }
     }

@@ -124,4 +124,19 @@ public class TkInspectionDetailsServiceImpl extends AbstractBaseService<TkInspec
         lambda.eq(TkInspectionDetailsEntity::getInspectionRecordId, inspectionRecordId);
         lambda.eq(TkInspectionDetailsEntity::getInspectionRecordId, inspectionRecordId);
         baseMapper.delete(wrapper);
         baseMapper.delete(wrapper);
     }
     }
+
+    @Override
+    public List<String> getDeviceRetaInspectionRecordId(String deviceId) {
+        if (StringUtils.isBlank(deviceId)) {
+            return new ArrayList<>(0);
+        }
+
+        QueryWrapper<TkInspectionDetailsEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkInspectionDetailsEntity> lambda = wrapper.lambda();
+        lambda.eq(TkInspectionDetailsEntity::getCheckDeviceId, deviceId);
+        List<TkInspectionDetailsEntity> tkInspectionDetailsEntityList = baseMapper.selectList(wrapper);
+        return CollectionUtils.emptyIfNull(tkInspectionDetailsEntityList).stream()
+                .map(TkInspectionDetailsEntity::getInspectionRecordId)
+                .collect(Collectors.toList());
+    }
 }
 }

@@ -72,6 +72,16 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect
             lambda.le(TkInspectionRecordEntity::getCheckDate, endTime);
             lambda.le(TkInspectionRecordEntity::getCheckDate, endTime);
         }
         }
 
 
+        if (queryMap != null && queryMap.get("deviceId") != null) {
+            String deviceId = queryMap.get("deviceId").toString();
+            List<String> inspectionRecordIdList = tkInspectionDetailsService.getDeviceRetaInspectionRecordId(deviceId);
+            if (CollectionUtils.isEmpty(inspectionRecordIdList)) {
+                return new TkPageData<>();
+            }
+
+            lambda.in(TkInspectionRecordEntity::getId, inspectionRecordIdList);
+        }
+
         IPage<TkInspectionRecordEntity> page = baseMapper.selectPage(getPage(queryMap, "create_time", false),
         IPage<TkInspectionRecordEntity> page = baseMapper.selectPage(getPage(queryMap, "create_time", false),
                 wrapper);
                 wrapper);
 
 

@@ -12,4 +12,6 @@ public interface TkInspectionDetailsService extends BaseService<TkInspectionDeta
     List<TkInspectionDetailsDTO> listByInspectionRecordId(String inspectionRecordId);
     List<TkInspectionDetailsDTO> listByInspectionRecordId(String inspectionRecordId);
 
 
     void deleteByInspectionRecordId(String inspectionRecordId);
     void deleteByInspectionRecordId(String inspectionRecordId);
+
+    List<String> getDeviceRetaInspectionRecordId(String deviceId);
 }
 }