|
|
@@ -142,7 +142,7 @@ public class QueryInspectionFilePageListByWorkOrderIdService { |
|
|
|
InspectionFileHandleVo inspectionFileHandleVo; |
|
|
|
User user; |
|
|
|
QuestionType questionType; |
|
|
|
List<String> handlerImageList = null; |
|
|
|
String handlerImages = ""; |
|
|
|
InspectionFileHandle inspectionFileHandle; |
|
|
|
for (InspectionFile inspectionFile : inspectionFileList) { |
|
|
|
inspectionFileHandleVo = new InspectionFileHandleVo(); |
|
|
@@ -164,26 +164,26 @@ public class QueryInspectionFilePageListByWorkOrderIdService { |
|
|
|
if (ObjectUtil.isNotNull(inspectionFileHandleMap)) { |
|
|
|
inspectionFileHandle = inspectionFileHandleMap.get(inspectionFile.getId()); |
|
|
|
if (null != inspectionFileHandle) { |
|
|
|
if (!StringUtils.isEmpty(inspectionFileHandle.getHandlerImage())) { |
|
|
|
handlerImageList = new ArrayList<>(); |
|
|
|
String[] arr = inspectionFileHandle.getHandlerImage().split(","); |
|
|
|
List<String> list = Arrays.stream(arr).map(String::toString).collect(Collectors.toList()); |
|
|
|
for (String str : list) { |
|
|
|
handlerImageList.add(CommonConfig.imageURL + str); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (ObjectUtil.isNotNull(inspectionFileHandleUserMap)) { |
|
|
|
user = inspectionFileHandleUserMap.get(inspectionFileHandle.getHandlerUser()); |
|
|
|
if (null != user) { |
|
|
|
inspectionFileHandleVo.setHandlerUsername(user.getRealname()); |
|
|
|
} |
|
|
|
|
|
|
|
inspectionFileHandleVo.setHandlerUser(inspectionFileHandle.getHandlerUser()); |
|
|
|
inspectionFileHandleVo.setHandlerImageList(handlerImageList); |
|
|
|
inspectionFileHandleVo.setHandlerTime(inspectionFileHandle.getHandlerTime()); |
|
|
|
inspectionFileHandleVo.setHandlerResult(inspectionFileHandle.getHandlerResult()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotEmpty(inspectionFileHandle.getHandlerImage())) { |
|
|
|
String[] arr = inspectionFileHandle.getHandlerImage().split(","); |
|
|
|
List<String> list = Arrays.stream(arr).map(String::toString).collect(Collectors.toList()); |
|
|
|
for (String str : list) { |
|
|
|
handlerImages += CommonConfig.imageURL + str + ","; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotEmpty(handlerImages)) { |
|
|
|
handlerImages = handlerImages.substring(0, handlerImages.length() - 1); |
|
|
|
inspectionFileHandleVo.setHandlerImages(handlerImages); |
|
|
|
} |
|
|
|
inspectionFileHandleVo.setHandlerUser(inspectionFileHandle.getHandlerUser()); |
|
|
|
inspectionFileHandleVo.setHandlerTime(inspectionFileHandle.getHandlerTime()); |
|
|
|
inspectionFileHandleVo.setHandlerResult(inspectionFileHandle.getHandlerResult()); |
|
|
|
} |
|
|
|
} |
|
|
|
inspectionFileHandleVoList.add(inspectionFileHandleVo); |