@@ -159,6 +159,16 @@ public class QueryInspectionFilePageListByWorkOrderIdService { | |||
queryWrapper.orderByDesc(InspectionFileCheckRecord::getCreateTime); | |||
List<InspectionFileCheckRecord> list = inspectionFileCheckRecordsService.list(queryWrapper); | |||
if (!CollectionUtils.isEmpty(list)){ | |||
for (InspectionFileCheckRecord inspectionFileCheckRecord : list) { | |||
if (StringUtils.isNotEmpty(inspectionFileCheckRecord.getHandlerImage())){ | |||
String handlerImages = ""; | |||
handlerImages += CommonConfig.imageURL + inspectionFileCheckRecord.getHandlerImage() + ","; | |||
handlerImages = handlerImages.substring(0, handlerImages.length() - 1); | |||
if (StringUtils.isNotEmpty(handlerImages)) { | |||
inspectionFileCheckRecord.setHandlerImage(handlerImages); | |||
} | |||
} | |||
} | |||
checkRecordMap = list.stream().collect(Collectors.groupingBy(InspectionFileCheckRecord::getInspectionFileId)); | |||
} | |||
} |
@@ -301,6 +301,16 @@ public class InspectionFileServiceImpl implements IInspectionFileService { | |||
queryWrapper.orderByDesc(InspectionFileCheckRecord::getCreateTime); | |||
List<InspectionFileCheckRecord> list = inspectionFileCheckRecordsService.list(queryWrapper); | |||
if (CollectionUtils.isNotEmpty(list)){ | |||
for (InspectionFileCheckRecord inspectionFileCheckRecord : list) { | |||
if (StringUtils.isNotEmpty(inspectionFileCheckRecord.getHandlerImage())){ | |||
String handlerImages = ""; | |||
handlerImages += CommonConfig.imageURL + inspectionFileCheckRecord.getHandlerImage() + ","; | |||
handlerImages = handlerImages.substring(0, handlerImages.length() - 1); | |||
if (StringUtils.isNotEmpty(handlerImages)) { | |||
inspectionFileCheckRecord.setHandlerImage(handlerImages); | |||
} | |||
} | |||
} | |||
vo.setList(list); | |||
} | |||
@@ -439,7 +439,18 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO | |||
List<InspectionFileCheckRecord> inspectionFileCheckRecords = | |||
inspectionFileCheckRecordMapper.selectList(new LambdaQueryWrapper<InspectionFileCheckRecord>().in(InspectionFileCheckRecord::getInspectionFileId, inspectionFiledIds) | |||
.orderByDesc(InspectionFileCheckRecord::getCreateTime)); | |||
if (CollectionUtils.isNotEmpty(inspectionFileCheckRecords)){ | |||
for (InspectionFileCheckRecord inspectionFileCheckRecord : inspectionFileCheckRecords) { | |||
if (StringUtils.isNotEmpty(inspectionFileCheckRecord.getHandlerImage())){ | |||
String handlerImages = ""; | |||
handlerImages += CommonConfig.imageURL + inspectionFileCheckRecord.getHandlerImage() + ","; | |||
handlerImages = handlerImages.substring(0, handlerImages.length() - 1); | |||
if (StringUtils.isNotEmpty(handlerImages)) { | |||
inspectionFileCheckRecord.setHandlerImage(handlerImages); | |||
} | |||
} | |||
} | |||
} | |||
List<WorkOrderHandleVo> list = inspectionFilePageData.getRecords().stream().map(t -> { | |||
WorkOrderHandleVo vo = new WorkOrderHandleVo(); | |||
BeanUtils.copyProperties(t, vo); |