|
@@ -409,6 +409,14 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
|
|
|
siteIdList.add(recordList.get(i).getSiteId());
|
|
|
recordIdList.add(recordList.get(i).getId());
|
|
|
}
|
|
|
+ List<PatrolInspectionSite> list1 = new ArrayList<>();
|
|
|
+ if (id != null && id != 0){
|
|
|
+ LambdaQueryWrapper<PatrolInspectionSite> queryWrapper1 = Wrappers.lambdaQuery();
|
|
|
+ queryWrapper1.select(PatrolInspectionSite::getId,PatrolInspectionSite::getPictureUrl)
|
|
|
+ .eq(PatrolInspectionSite::getId,recordList.get(0).getSiteId());
|
|
|
+ list1 = patrolInspectionSiteService.list(queryWrapper1);
|
|
|
+ }
|
|
|
+
|
|
|
LambdaQueryWrapper<PatrolInspectionRecordPicture> queryOne = Wrappers.lambdaQuery();
|
|
|
queryOne.in(PatrolInspectionRecordPicture::getRecordId, recordIdList);
|
|
|
List<PatrolInspectionRecordPicture> recordPictureList = patrolInspectionRecordPictureService.list(queryOne);
|
|
@@ -429,6 +437,11 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
|
|
|
});
|
|
|
for (int i = 0; i < recordList.size(); i++) {
|
|
|
PatrolInspectionRecordVo record = new PatrolInspectionRecordVo();
|
|
|
+ for (int j = 0; j < list1.size(); j++) {
|
|
|
+ if (recordList.get(i).getSiteId()==list1.get(j).getId()){
|
|
|
+ record.setPictureUrl(list1.get(j).getPictureUrl());
|
|
|
+ }
|
|
|
+ }
|
|
|
record.setId(recordList.get(i).getId());
|
|
|
record.setSiteNubmber(recordList.get(i).getSiteNubmber());
|
|
|
record.setSiteType(recordList.get(i).getSiteType());
|