Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/update/status/UpdateInspectionStatusService.java

@@ -64,7 +64,7 @@ public class UpdateInspectionStatusService {
 
         Inspection inspection = (Inspection) result.getData();
 
-        if (AirPortTaskStatusEnum.FLIGHT.getCode() != missionStatusRequest.getStatus() && AirPortTaskStatusEnum.WAIT.getCode() == missionStatusRequest.getStatus()) {
+        if (AirPortTaskStatusEnum.FLIGHT.getCode() != missionStatusRequest.getStatus() && AirPortTaskStatusEnum.WAIT.getCode() != missionStatusRequest.getStatus()) {
             log.info("修改任务状态业务接口：飞行状态出错！");
             return JsonResult.error(EditInspectionStatusCodeEnum.TASK_NOT_STATUS.getCode(), EditInspectionStatusCodeEnum.TASK_NOT_STATUS.getMsg());
         }

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

@@ -94,7 +94,6 @@ public class QueryInspectionFileHandleByInspectionFileIdService {
         String handlerImages = "";
         if (null != inspectionFileHandle) {
             inspectionFileHandleVo = InspectionFileHandleConverMapper.INSTANCE.fromInspectionFileHandleToInspectionFileHandleVo(inspectionFileHandle);
-
             if (!StringUtils.isEmpty(inspectionFileHandle.getHandlerImage())) {
                 String[] arr = inspectionFileHandle.getHandlerImage().split(",");
                 List<String> list = Arrays.stream(arr).map(String::toString).collect(Collectors.toList());
@@ -109,7 +108,6 @@ public class QueryInspectionFileHandleByInspectionFileIdService {
             handlerImages = handlerImages.substring(0, handlerImages.length() - 1);
             inspectionFileHandleVo.setHandlerImages(handlerImages);
         }
-
         QuestionType questionType = questionTypeMapper.selectOne(new LambdaQueryWrapper<QuestionType>()
                                         .eq(QuestionType::getCode, inspectionFile.getQuestionCode())
                                         .eq(QuestionType::getMark, 1));
@@ -119,6 +117,7 @@ public class QueryInspectionFileHandleByInspectionFileIdService {
         }
         inspectionFileHandleVo.setQuestionCode(inspectionFile.getQuestionCode());
         inspectionFileHandleVo.setFileThumbnail(CommonConfig.imageURL + inspectionFile.getFileThumbnail());
+        inspectionFileHandleVo.setFileOriginal(CommonConfig.imageURL + inspectionFile.getFileOriginal());
         return inspectionFileHandleVo;
     }
 }

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

@@ -36,11 +36,21 @@ public class InspectionFileHandleVo {
      */
     private String questionContent;
 
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
     /**
      * 缩略图
      */
     private String fileThumbnail;
 
+    /**
+     * 原图
+     */
+    private String fileOriginal;
+
     /**
      * 处理人ID
      */