|
|
@@ -141,17 +141,11 @@ public class QueryInspectionFilePageListService { |
|
|
|
private List<InspectionFilePageListVo> buildInspectionFilePageListVoList(List<InspectionFileExtend> inspectionFileExtendList) { |
|
|
|
Map<String, RoadInformation> roadMap = this.getRoadMap(inspectionFileExtendList); |
|
|
|
Map<String, Dept> deptMap = this.getDeptMap(inspectionFileExtendList); |
|
|
|
Map<String, QuestionType> questionTypeMap = this.getQuestionTypeMap(); |
|
|
|
// Map<String, QuestionType> questionTypeMap = this.getQuestionTypeMap(); |
|
|
|
List<InspectionFilePageListVo> inspectionFilePageListVoList = InspectionFileConverMapper.INSTANCE.fromInspectionFileExtendListToInspectionFilePageListVoList(inspectionFileExtendList); |
|
|
|
QuestionType questionType; |
|
|
|
RoadInformation road; |
|
|
|
Dept dept; |
|
|
|
for (InspectionFilePageListVo inspectionFilePageListVo : inspectionFilePageListVoList) { |
|
|
|
questionType = questionTypeMap.get(inspectionFilePageListVo.getQuestionId()); |
|
|
|
if (null != questionType) { |
|
|
|
inspectionFilePageListVo.setQuestionName(Integer.toString(questionType.getName())); |
|
|
|
inspectionFilePageListVo.setQuestionContent(questionType.getContent()); |
|
|
|
} |
|
|
|
road = roadMap.get(inspectionFilePageListVo.getRoadId()); |
|
|
|
dept = deptMap.get(inspectionFilePageListVo.getDeptId()); |
|
|
|
if (ObjectUtil.isNotNull(road)) { |