Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/handle/QueryInspectionFileHandleByInspectionFileIdService.java

@@ -125,6 +125,7 @@ public class QueryInspectionFileHandleByInspectionFileIdService {
             }
         }
         inspectionFileHandleVo.setQuestionCode(inspectionFile.getQuestionCode());
+        inspectionFileHandleVo.setFileImage(CommonConfig.imageURL + inspectionFile.getFileImage());
         inspectionFileHandleVo.setFileThumbnail(CommonConfig.imageURL + inspectionFile.getFileThumbnail());
         inspectionFileHandleVo.setFileOriginal(CommonConfig.imageURL + inspectionFile.getFileOriginal());
         return inspectionFileHandleVo;

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/query/QueryInspectionFileDistributionListService.java

@@ -128,6 +128,9 @@ public class QueryInspectionFileDistributionListService {
             if (null != questionType) {
                 inspectionFileDistributionListVo.setQuestionName(questionType.getContent());
             }
+            if (StringUtils.isNotEmpty(inspectionFileDistributionListVo.getFileImage())) {
+                inspectionFileDistributionListVo.setFileImage(CommonConfig.imageURL + inspectionFileDistributionListVo.getFileImage());
+            }
             if (StringUtils.isNotEmpty(inspectionFileDistributionListVo.getFileThumbnail())) {
                 inspectionFileDistributionListVo.setFileThumbnail(CommonConfig.imageURL + inspectionFileDistributionListVo.getFileThumbnail());
             }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/query/QueryInspectionFilePageListByInspectionIdService.java

@@ -107,11 +107,9 @@ public class QueryInspectionFilePageListByInspectionIdService {
      * @return
      */
     private List<InspectionFilePageListByInspectionIdVo> buildInspectionFilePageListVoList(List<InspectionFile> inspectionFileList) {
-        List<QuestionType> questionTypeList = questionTypeMapper.selectList(new LambdaQueryWrapper<QuestionType>()
-                .eq(QuestionType::getMark, MarkEnum.VALID.getCode()));
         List<InspectionFilePageListByInspectionIdVo> inspectionFilePageListVoList = InspectionFileConverMapper.INSTANCE.fromInspectionFileListToInspectionFilePageByInspectionIdListVoList(inspectionFileList);
         for (InspectionFilePageListByInspectionIdVo inspectionFilePageListVo : inspectionFilePageListVoList) {
-
+            inspectionFilePageListVo.setFileImage(CommonConfig.imageURL + inspectionFilePageListVo.getFileImage());
             inspectionFilePageListVo.setFileThumbnail(CommonConfig.imageURL + inspectionFilePageListVo.getFileThumbnail());
             inspectionFilePageListVo.setFileOriginal(CommonConfig.imageURL + inspectionFilePageListVo.getFileOriginal());
         }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/query/QueryInspectionFilePageListByWorkOrderIdService.java

@@ -149,6 +149,7 @@ public class QueryInspectionFilePageListByWorkOrderIdService {
             inspectionFileHandleVo.setLatitude(inspectionFile.getLatitude());
             inspectionFileHandleVo.setLongitude(inspectionFile.getLongitude());
             inspectionFileHandleVo.setLocation(inspectionFile.getLocation());
+            inspectionFileHandleVo.setFileImage(CommonConfig.imageURL + inspectionFile.getFileImage());
             inspectionFileHandleVo.setFileThumbnail(CommonConfig.imageURL + inspectionFile.getFileThumbnail());
             inspectionFileHandleVo.setFileOriginal(CommonConfig.imageURL + inspectionFile.getFileOriginal());
             questionType = questionTypeMap.get(inspectionFile.getQuestionCode());

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/query/QueryInspectionFilePageListService.java

@@ -144,7 +144,6 @@ 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();
         List<InspectionFilePageListVo> inspectionFilePageListVoList = InspectionFileConverMapper.INSTANCE.fromInspectionFileExtendListToInspectionFilePageListVoList(inspectionFileExtendList);
         RoadInformation road;
         Dept dept;
@@ -157,6 +156,7 @@ public class QueryInspectionFilePageListService {
             if (ObjectUtil.isNotNull(dept)) {
                 inspectionFilePageListVo.setDeptName(dept.getName());
             }
+            inspectionFilePageListVo.setFileImage(CommonConfig.imageURL + inspectionFilePageListVo.getFileImage());
             inspectionFilePageListVo.setFileThumbnail(CommonConfig.imageURL + inspectionFilePageListVo.getFileThumbnail());
             inspectionFilePageListVo.setFileOriginal(CommonConfig.imageURL + inspectionFilePageListVo.getFileOriginal());
         }
@@ -195,18 +195,4 @@ public class QueryInspectionFilePageListService {
         return deptMap;
     }
 
-    /**
-     *
-     * 获取问题类型列表，放到map，减少循环次数
-     *
-     * @return
-     */
-    private Map<String, QuestionType> getQuestionTypeMap() {
-        List<QuestionType> questionTypeList = questionTypeMapper.selectList(new LambdaQueryWrapper<QuestionType>()
-                .eq(QuestionType::getMark, 1));
-
-        Map<String, QuestionType> questionTypeMap = questionTypeList.stream().collect(Collectors.toMap(QuestionType::getId, Function.identity()));
-        return questionTypeMap;
-    }
-
 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/report/export/GenerateReportWordService.java

@@ -314,7 +314,7 @@ public class GenerateReportWordService {
                     str = "问题图片";
                     cell.add(new Paragraph(str, font));
                 } else if (j == 6) {
-                    String imageUrl = inspectionFile.getFileOriginal();
+                    String imageUrl = inspectionFile.getFileImage();
                     cell = this.getImageCell(imageUrl);
                 }
                 table.addCell(cell);

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/report/query/QueryInspectionHandleReportService.java

@@ -119,6 +119,7 @@ public class QueryInspectionHandleReportService {
             List<String> handlerImageList = null;
             for (InspectionFileReportVo inspectionFileReportVo : inspectionFileHandleVoList) {
                 inspectionFileHandle = inspectionFileHandleMap.get(inspectionFileReportVo.getId());
+                inspectionFileReportVo.setFileImage(CommonConfig.imageURL + inspectionFileReportVo.getFileImage());
                 inspectionFileReportVo.setFileThumbnail(CommonConfig.imageURL + inspectionFileReportVo.getFileThumbnail());
                 inspectionFileReportVo.setFileOriginal(CommonConfig.imageURL + inspectionFileReportVo.getFileOriginal());
                 if (null != inspectionFileHandle) {

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/report/query/QueryInspectionReportService.java

@@ -106,6 +106,7 @@ public class QueryInspectionReportService {
         List<InspectionFileReportVo> inspectionFileHandleVoList = InspectionFileConverMapper.INSTANCE.fromInspectionFileListToInspectionFileHandleVoList(inspectionFileList);
         if (CollectionUtil.isNotEmpty(inspectionFileHandleVoList)) {
             for (InspectionFileReportVo inspectionFileReportVo : inspectionFileHandleVoList) {
+                inspectionFileReportVo.setFileImage(CommonConfig.imageURL + inspectionFileReportVo.getFileImage());
                 inspectionFileReportVo.setFileThumbnail(CommonConfig.imageURL + inspectionFileReportVo.getFileThumbnail());
                 inspectionFileReportVo.setFileOriginal(CommonConfig.imageURL + inspectionFileReportVo.getFileOriginal());
             }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionFileDistributionListVo.java

@@ -35,6 +35,11 @@ public class InspectionFileDistributionListVo {
      */
     private String fileName;
 
+    /**
+     * 标记图
+     */
+    private String fileImage;
+
     /**
      * 缩略图
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionFileHandleVo.java

@@ -36,6 +36,11 @@ public class InspectionFileHandleVo {
      */
     private String fileName;
 
+    /**
+     * 标记图
+     */
+    private String fileImage;
+
     /**
      * 缩略图
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionFilePageListByInspectionIdVo.java

@@ -32,6 +32,11 @@ public class InspectionFilePageListByInspectionIdVo {
      */
     private String fileName;
 
+    /**
+     * 标记图
+     */
+    private String fileImage;
+
     /**
      * 缩略图
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionFilePageListVo.java

@@ -35,6 +35,11 @@ public class InspectionFilePageListVo {
      */
     private String fileName;
 
+    /**
+     * 标记图
+     */
+    private String fileImage;
+
     /**
      * 缩略图
      */

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/inspection/InspectionFileReportVo.java

@@ -32,6 +32,11 @@ public class InspectionFileReportVo {
      */
     private String fileName;
 
+    /**
+     * 标记图
+     */
+    private String fileImage;
+
     /**
      * 缩略图
      */