问题核实接口

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/controller/InspectionFileController.java

@@ -85,8 +85,4 @@ public class InspectionFileController {
 
 
 
-
-
-
-
 }

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java

@@ -12,14 +12,8 @@ import com.tuoheng.common.core.exception.ServiceException;
 import com.tuoheng.common.core.utils.JsonResult;
 import com.tuoheng.common.core.utils.SecurityUserUtils;
 import com.tuoheng.common.core.utils.StringUtils;
-import com.tuoheng.miniprogram.dao.InspectionFileMapper;
-import com.tuoheng.miniprogram.dao.InspectionMapper;
-import com.tuoheng.miniprogram.dao.RoadInformationMapper;
-import com.tuoheng.miniprogram.dao.UserMapper;
-import com.tuoheng.miniprogram.entity.Inspection;
-import com.tuoheng.miniprogram.entity.InspectionFile;
-import com.tuoheng.miniprogram.entity.RoadInformation;
-import com.tuoheng.miniprogram.entity.User;
+import com.tuoheng.miniprogram.dao.*;
+import com.tuoheng.miniprogram.entity.*;
 import com.tuoheng.miniprogram.entity.dto.QuestionIdentificationDto;
 import com.tuoheng.miniprogram.entity.query.InspectionFileQuery;
 import com.tuoheng.miniprogram.service.IInspectionFileService;
@@ -49,6 +43,9 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
     @Autowired
     private RoadInformationMapper roadInformationMapper;
 
+    @Autowired
+    private QuestionTypeMapper questionTypeMapper;
+
     /**
      *待确认问题 status状态为5
      * @param query
@@ -263,6 +260,18 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
             if (StringUtils.isNotEmpty(t.getFileThumbnail())) {
                 vo.setFileThumbnail(CommonConfig.imageURL + t.getFileThumbnail());
             }
+            //问题类型
+            if(StringUtils.isNotEmpty(t.getQuestionId())){
+                QuestionType questionType = questionTypeMapper.selectOne(Wrappers.<QuestionType>lambdaQuery()
+                        .eq(QuestionType::getId, t.getQuestionId())
+                        .eq(QuestionType::getMark, 1));
+                if(null == questionType){
+                    throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
+                }
+                if(null != questionType.getName()){
+                    vo.setQuestionName(questionType.getName());
+                }
+            }
 
             return vo;
         });

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/vo/InspectionFileInfoVo.java

@@ -24,9 +24,9 @@ public class InspectionFileInfoVo {
     private String name;
 
     /**
-     * 问题描述
+     * 问题类型
      */
-    private String questionDesc;
+    private Integer questionName;
 
     /**
      * 位置(公路代号)