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/entity/InspectionFile.java

@@ -101,14 +101,14 @@ public class InspectionFile extends BaseEntity {
     private String gaodeAddress;
 
     /**
-     * 问题类型二级分类ID
+     * 图片来源：1AI 2后台 3视频
      */
-    private String questionId;
+    private Integer source;
 
     /**
-     * 图片来源：1AI 2后台 3视频
+     * 问题类型二级分类ID
      */
-    private Integer source;
+    private String questionCode;
 
     /**
      * 问题名称
@@ -118,7 +118,7 @@ public class InspectionFile extends BaseEntity {
     /**
      * 巡检内容
      */
-    private String content;
+    private String questionContent;
 
     /**
      * 详细描述

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/InspectionFileDistribution.java

@@ -66,7 +66,7 @@ public class InspectionFileDistribution extends BaseEntity {
     /**
      * 问题类型二级分类ID
      */
-    private String questionId;
+    private String questionCode;
 
     /**
      * 问题名称

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/InspectionFileExtend.java

@@ -102,7 +102,7 @@ public class InspectionFileExtend extends BaseEntity {
     /**
      * 问题类型二级分类ID
      */
-    private String questionId;
+    private String questionCode;
 
     /**
      * 图片来源：1AI 2后台 3视频
@@ -117,7 +117,7 @@ public class InspectionFileExtend extends BaseEntity {
     /**
      * 巡检内容
      */
-    private String content;
+    private String questionContent;
 
     /**
      * 详细描述

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspectionfile/QueryInspectionFileDistributionListRequest.java

@@ -1,6 +1,5 @@
 package com.tuoheng.admin.request.inspectionfile;
 
-import com.tuoheng.common.core.common.BaseQuery;
 import lombok.Data;
 
 import java.util.List;
@@ -23,7 +22,7 @@ public class QueryInspectionFileDistributionListRequest {
     /**
      * 问题类型
      */
-    private String questionId;
+    private String questionCode;
 
     /**
      * 问题状态：5待确认 10已忽略 15已确认 20已生成工单 25问题已处理

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspectionfile/QueryInspectionFilePageListByInspectionIdRequest.java

@@ -23,7 +23,7 @@ public class QueryInspectionFilePageListByInspectionIdRequest extends BaseQuery
     /**
      * 问题类型
      */
-    private String questionId;
+    private String questionCode;
 
     /**
      * 问题状态：5待确认 10已忽略 15已确认 20已生成工单 25问题已处理

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/request/inspectionfile/QueryInspectionFilePageListRequest.java

@@ -26,7 +26,7 @@ public class QueryInspectionFilePageListRequest extends BaseQuery {
     /**
      * 问题类型
      */
-    private String questionId;
+    private String questionCode;
 
     /**
      * 问题状态

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/QueryInspectionPageListService.java

@@ -10,13 +10,13 @@ import com.tuoheng.admin.entity.User;
 import com.tuoheng.admin.enums.RoleEnum;
 import com.tuoheng.admin.enums.code.inspection.QueryInspectionPageListCodeEnum;
 import com.tuoheng.admin.mapper.DeptMapper;
-import com.tuoheng.admin.mapper.InspectionFileMapper;
 import com.tuoheng.admin.mapper.InspectionMapper;
 import com.tuoheng.admin.mapper.UserMapper;
 import com.tuoheng.admin.request.inspection.QueryInspectionPageListRequest;
 import com.tuoheng.admin.service.inspection.query.handle.GenerateInspectionFieldHander;
 import com.tuoheng.admin.utils.CurrentUserUtil;
 import com.tuoheng.admin.vo.inspection.InspectionVo;
+import com.tuoheng.common.core.config.common.CommonConfig;
 import com.tuoheng.common.core.utils.JsonResult;
 import com.tuoheng.common.core.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -49,9 +49,6 @@ public class QueryInspectionPageListService {
     @Autowired
     private InspectionMapper inspectionMapper;
 
-    @Autowired
-    private InspectionFileMapper inspectionFileMapper;
-
     @Autowired
     @Qualifier("executeHandle")
     private GenerateInspectionFieldHander executeHandle;
@@ -221,6 +218,7 @@ public class QueryInspectionPageListService {
         for (InspectionVo inspectionVo : inspectionVoList) {
             deptName = deptMap.get(inspectionVo.getDeptId());
             inspectionVo.setDeptName(deptName);
+            inspectionVo.setAiVideoUrl(CommonConfig.videoURL + inspectionVo.getAiVideoUrl());
             executeHandle.handler(user, dept, inspectionVo);
         }
         return inspectionVoList;

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

@@ -149,6 +149,7 @@ public class UpdateFlightStatusService {
     private LiveChannel buildLiveChannel(Inspection inspection, DspCallbackVo dspCallbackVo) {
         LiveChannel liveChannel = new LiveChannel();
         liveChannel.setTenantId(inspection.getTenantId());
+        liveChannel.setDeptId(inspection.getDeptId());
         liveChannel.setInspectionId(inspection.getId());
         liveChannel.setChannelCode("0");
         liveChannel.setPushUrl(dspCallbackVo.getPushUrl());

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

@@ -56,8 +56,7 @@ public class UpdateInspectionStatusService {
      */
     public JsonResult updateStatus(MissionStatusRequest missionStatusRequest) {
         log.info("进入修改任务状态业务接口, missionStatusRequest:{}", missionStatusRequest);
-        String tenantId = CurrentUserUtil.getTenantId();
-        JsonResult result = this.check(tenantId, missionStatusRequest);
+        JsonResult result = this.check(missionStatusRequest);
         if (0 != result.getCode()) {
             log.info("修改任务状态业务接口：校验失败：{}", result.getMsg());
             return result;
@@ -84,11 +83,11 @@ public class UpdateInspectionStatusService {
 
     /**
      * 检查参数
-     * @param tenantId
+     *
      * @param missionStatusRequest
      * @return
      */
-    private JsonResult check(String tenantId, MissionStatusRequest missionStatusRequest) {
+    private JsonResult check(MissionStatusRequest missionStatusRequest) {
         //查询出对应的巡检任务
         Inspection inspection = inspectionMapper.selectOne(new LambdaQueryWrapper<Inspection>()
                 .eq(Inspection::getMark, MarkTypeEnum.VALID.getCode())

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/InspectionFileServiceImpl.java

@@ -146,8 +146,10 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
                 }
                 vo.setName(inspection.getName());
                 //问题类型
-                if (StringUtils.isNotEmpty(x.getQuestionId())) {
-                    QuestionType questionType = questionTypeMapper.selectById(x.getQuestionId());
+                if (StringUtils.isNotEmpty(x.getQuestionCode())) {
+                    QuestionType questionType = questionTypeMapper.selectOne(new LambdaQueryWrapper<QuestionType>()
+                                                .eq(QuestionType::getMark, 1)
+                                                .eq(QuestionType::getCode, x.getQuestionCode()));
                     if (null != questionType) {
                         vo.setCode(questionType.getCode());
                         vo.setContent(questionType.getContent());
@@ -212,13 +214,13 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
                 JsonResult.error(ListByDeptUserTypeEnum.INSPECTION_TYPE_LIST_IS_NULL.getCode(),ListByDeptUserTypeEnum.INSPECTION_TYPE_LIST_IS_NULL.getMsg());
             }
             for (InspectionFile inspectionFile : inspectionFileList) {
-                if(StringUtils.isEmpty(inspectionFile.getQuestionId())){
+                if(StringUtils.isEmpty(inspectionFile.getQuestionCode())){
                     JsonResult.error(ListByDeptUserTypeEnum.QUESTION_ID_IS_NULL.getCode(),ListByDeptUserTypeEnum.QUESTION_ID_IS_NULL.getMsg());
                 }
                 //查找问题类型
                 QuestionType questionType = questionTypeMapper.selectOne(Wrappers.<QuestionType>lambdaQuery()
                         .eq(QuestionType::getMark, 1)
-                        .eq(QuestionType::getId, inspectionFile.getQuestionId()));
+                        .eq(QuestionType::getCode, inspectionFile.getQuestionCode()));
                 if(ObjectUtil.isNull(questionType)){
                     throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
                 }
@@ -282,13 +284,13 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
                 JsonResult.error(ListByDeptUserTypeEnum.INSPECTION_TYPE_LIST_IS_NULL.getCode(),ListByDeptUserTypeEnum.INSPECTION_TYPE_LIST_IS_NULL.getMsg());
             }
             for (InspectionFile inspectionFile : inspectionFileList) {
-                if(StringUtils.isEmpty(inspectionFile.getQuestionId())){
+                if(StringUtils.isEmpty(inspectionFile.getQuestionCode())){
                     JsonResult.error(ListByDeptUserTypeEnum.QUESTION_ID_IS_NULL.getCode(),ListByDeptUserTypeEnum.QUESTION_ID_IS_NULL.getMsg());
                 }
                 //查找问题类型
                 QuestionType questionType = questionTypeMapper.selectOne(Wrappers.<QuestionType>lambdaQuery()
                         .eq(QuestionType::getMark, 1)
-                        .eq(QuestionType::getId, inspectionFile.getQuestionId()));
+                        .eq(QuestionType::getCode, inspectionFile.getQuestionCode()));
                 if(ObjectUtil.isNull(questionType)){
                     throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
                 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/confirm/InspectionFileConfirmService.java

@@ -93,6 +93,8 @@ public class InspectionFileConfirmService {
         map.put("status", InspectionFileStatusEnum.CONFIRMED.getCode());
         map.put("updateUser", userId);
         map.put("updateTime", DateUtils.now());
+        map.put("checkUser", userId);
+        map.put("checkTime", DateUtils.now());
         map.put("idList", idList);
 
         Integer rowCount = inspectionFileMapper.updateByIdList(map);

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

@@ -111,13 +111,13 @@ public class QueryInspectionFileHandleByInspectionFileIdService {
         }
 
         QuestionType questionType = questionTypeMapper.selectOne(new LambdaQueryWrapper<QuestionType>()
-                                        .eq(QuestionType::getId, inspectionFile.getQuestionId())
+                                        .eq(QuestionType::getCode, inspectionFile.getQuestionCode())
                                         .eq(QuestionType::getMark, 1));
         if (null != questionType) {
             inspectionFileHandleVo.setQuestionName(questionType.getName());
             inspectionFileHandleVo.setQuestionContent(questionType.getContent());
         }
-        inspectionFileHandleVo.setQuestionId(inspectionFile.getQuestionId());
+        inspectionFileHandleVo.setQuestionCode(inspectionFile.getQuestionCode());
         inspectionFileHandleVo.setFileThumbnail(CommonConfig.imageURL + inspectionFile.getFileThumbnail());
         return inspectionFileHandleVo;
     }

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

@@ -45,7 +45,7 @@ public class QueryInspectionFilePageListByInspectionIdService {
     private QuestionTypeMapper questionTypeMapper;
 
     public JsonResult getPageListByInspectionId(QueryInspectionFilePageListByInspectionIdRequest request) {
-        log.info("进入根据任务ID查询巡检任务问题分页列表业务, inspectionId:{}, questionId:{}", request.getInspectionId(), request.getQuestionId());
+        log.info("进入根据任务ID查询巡检任务问题分页列表业务, inspectionId:{}, questionId:{}", request.getInspectionId(), request.getQuestionCode());
         JsonResult result = this.check(request);
         if (0 != result.getCode()) {
             log.info("进入根据任务ID查询巡检任务问题分页列表业务：校验失败：{}", result.getMsg());
@@ -113,15 +113,10 @@ public class QueryInspectionFilePageListByInspectionIdService {
         Map<String, QuestionType> questionTypeMap = questionTypeList.stream().collect(Collectors.toMap(QuestionType::getId, Function.identity()));
 
         List<InspectionFilePageListByInspectionIdVo> inspectionFilePageListVoList = InspectionFileConverMapper.INSTANCE.fromInspectionFileListToInspectionFilePageByInspectionIdListVoList(inspectionFileList);
-        QuestionType questionType;
-        Integer questionName;
         for (InspectionFilePageListByInspectionIdVo inspectionFilePageListVo : inspectionFilePageListVoList) {
-            questionType = questionTypeMap.get(inspectionFilePageListVo.getQuestionId());
-            if (null != questionType) {
-                questionName = questionType.getName();
-                inspectionFilePageListVo.setQuestionName(Integer.toString(questionName));
-            }
+
             inspectionFilePageListVo.setFileThumbnail(CommonConfig.imageURL + inspectionFilePageListVo.getFileThumbnail());
+            inspectionFilePageListVo.setFileOriginal(CommonConfig.imageURL + inspectionFilePageListVo.getFileOriginal());
         }
         return inspectionFilePageListVoList;
     }

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

@@ -154,9 +154,9 @@ public class QueryInspectionFilePageListByWorkOrderIdService {
             inspectionFileHandleVo.setLocation(inspectionFile.getLocation());
             inspectionFileHandleVo.setFileThumbnail(CommonConfig.imageURL + inspectionFile.getFileThumbnail());
 
-            questionType = questionTypeMap.get(inspectionFile.getQuestionId());
+            questionType = questionTypeMap.get(inspectionFile.getQuestionCode());
             if (null != questionType) {
-                inspectionFileHandleVo.setQuestionId(questionType.getId());
+                inspectionFileHandleVo.setQuestionCode(questionType.getCode());
                 inspectionFileHandleVo.setQuestionName(questionType.getName());
                 inspectionFileHandleVo.setQuestionContent(questionType.getContent());
             }
@@ -200,7 +200,7 @@ public class QueryInspectionFilePageListByWorkOrderIdService {
     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()));
+        Map<String, QuestionType> questionTypeMap = questionTypeList.stream().collect(Collectors.toMap(QuestionType::getCode, Function.identity()));
         return questionTypeMap;
     }
 

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

@@ -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)) {
@@ -161,6 +155,7 @@ public class QueryInspectionFilePageListService {
                 inspectionFilePageListVo.setDeptName(dept.getName());
             }
             inspectionFilePageListVo.setFileThumbnail(CommonConfig.imageURL + inspectionFilePageListVo.getFileThumbnail());
+            inspectionFilePageListVo.setFileOriginal(CommonConfig.imageURL + inspectionFilePageListVo.getFileOriginal());
         }
         return inspectionFilePageListVoList;
     }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/update/UpdateInspectionFileQuestionTypeService.java

@@ -48,7 +48,7 @@ public class UpdateInspectionFileQuestionTypeService {
         QuestionType questionType = (QuestionType) result.getData();
         InspectionFile inspectionFile = new InspectionFile();
         inspectionFile.setId(id);
-        inspectionFile.setQuestionId(questionType.getId());
+        inspectionFile.setQuestionCode(questionType.getCode());
         inspectionFile.setUpdateUser(userId);
         inspectionFile.setUpdateTime(DateUtils.now());
         Integer rowId = inspectionFileMapper.updateById(inspectionFile);

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

@@ -214,7 +214,7 @@ public class GenerateReportWordService {
         Cell questionTypeCell;
         for (int i = 0; i < questionTypeList.size(); i++) {
             questionType = questionTypeList.get(i);
-            String count = this.getCount(report.getInspectionId(), questionType.getId());
+            String count = this.getCount(report.getInspectionId(), questionType.getCode());
             questionTypeContentCell = this.getCell(font, questionType.getContent());
             questionTypeCell = this.getCell(font, count);
             table.addCell(questionTypeContentCell);
@@ -231,10 +231,10 @@ public class GenerateReportWordService {
         return cell;
     }
 
-    private String getCount(String inspectionId, String questionTypeId) {
+    private String getCount(String inspectionId, String questionCode) {
         Integer count = inspectionFileMapper.selectCount(new LambdaQueryWrapper<InspectionFile>()
                 .eq(InspectionFile::getInspectionId, inspectionId)
-                .eq(InspectionFile::getQuestionId, questionTypeId)
+                .eq(InspectionFile::getQuestionCode, questionCode)
                 .eq(InspectionFile::getMark, 1));
         return Integer.toString(count);
     }

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

@@ -133,7 +133,7 @@ public class QueryInspectionReportService {
         for (int i = 0; i < questionTypeList.size(); i++) {
             inspectionResultVo = new InspectionResultVo();
             questionType = questionTypeList.get(i);
-            Integer count = this.getCount(report.getInspectionId(), questionType.getId());
+            Integer count = this.getCount(report.getInspectionId(), questionType.getCode());
             inspectionResultVo.setQuestionTypeContent(questionType.getContent());
             inspectionResultVo.setCount(count);
             inspectionResultVoList.add(inspectionResultVo);
@@ -141,10 +141,10 @@ public class QueryInspectionReportService {
         return inspectionResultVoList;
     }
 
-    private Integer getCount(String inspectionId, String questionTypeId) {
+    private Integer getCount(String inspectionId, String questionCode) {
         Integer count = inspectionFileMapper.selectCount(new LambdaQueryWrapper<InspectionFile>()
                 .eq(InspectionFile::getInspectionId, inspectionId)
-                .eq(InspectionFile::getQuestionId, questionTypeId)
+                .eq(InspectionFile::getQuestionCode, questionCode)
                 .eq(InspectionFile::getMark, 1));
         return count;
     }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/DspCallbackServiceImpl.java

@@ -157,7 +157,9 @@ public class DspCallbackServiceImpl implements IDspCallbackService {
                 // 对象属性拷贝
                 BeanUtils.copyProperties(questionFile, inspectionFile);
                 //问题编号
-                inspectionFile.setQuestionId(questionFile.getQuestionCode());
+                inspectionFile.setQuestionCode(questionFile.getQuestionCode());
+                // 问题名称
+                inspectionFile.setQuestionContent(questionFile.getQuestionName());
                 inspectionFile.setTenantId(inspection.getTenantId());
                 inspectionFile.setInspectionId(inspectionId);
                 // 文件类型
@@ -180,8 +182,7 @@ public class DspCallbackServiceImpl implements IDspCallbackService {
                     fileMarkerUrl = fileMarkerUrl.replaceAll(CommonConfig.imageURL, "");
                 }
                 inspectionFile.setFileImage(fileMarkerUrl);
-                // 问题名称
-                inspectionFile.setQuestionName(questionFile.getQuestionName());
+
                 // 问题图片审核状态
                 inspectionFile.setStatus(InspectionFileStatusEnum.WAIT_CONFIRMED.getCode());
                 // 问题图片来源

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

@@ -24,7 +24,7 @@ public class InspectionFileHandleVo {
     /**
      * 问题类型:1坑槽，2积水，3裂缝
      */
-    private String questionId;
+    private String questionCode;
 
     /**
      * 问题名称：1坑槽，2积水，3裂缝

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

@@ -20,18 +20,33 @@ public class InspectionFilePageListByInspectionIdVo {
     /**
      * 问题类型:1坑槽，2积水，3裂缝
      */
-    private String questionId;
+    private String questionCode;
 
     /**
      * 类型名称：1坑槽，2积水，3裂缝
      */
     private String questionName;
 
+    /**
+     * 问题内容
+     */
+    private String questionContent;
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
     /**
      * 缩略图
      */
     private String fileThumbnail;
 
+    /**
+     * 原图
+     */
+    private String fileOriginal;
+
     /**
      * 经度
      */

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

@@ -23,7 +23,7 @@ public class InspectionFilePageListVo {
     /**
      * 问题类型:1坑槽，2积水，3裂缝
      */
-    private String questionId;
+    private String questionCode;
 
     /**
      * 问题名称：1坑槽，2积水，3裂缝
@@ -35,11 +35,21 @@ public class InspectionFilePageListVo {
      */
     private String questionContent;
 
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
     /**
      * 缩略图
      */
     private String fileThumbnail;
 
+    /**
+     * 原图
+     */
+    private String fileOriginal;
+
     /**
      * 经度
      */

tuoheng-service/tuoheng-admin/src/main/resources/mapper/InspectionFileMapper.xml

@@ -21,10 +21,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gaodeLongitude"    column="gaode_longitude"    />
         <result property="gaodeLatitude"    column="gaode_latitude"    />
         <result property="gaodeAddress"    column="gaode_address"    />
-        <result property="questionId"    column="question_id"    />
+        <result property="questionCode"    column="question_code"    />
         <result property="source"    column="source"    />
         <result property="questionName"    column="question_name"    />
-        <result property="content"    column="content"    />
+        <result property="questionContent"    column="question_content"    />
         <result property="questionDesc"    column="question_desc"    />
         <result property="status"    column="status"    />
         <result property="checkUser"    column="check_user"    />
@@ -53,10 +53,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gaodeLongitude"    column="gaode_longitude"    />
         <result property="gaodeLatitude"    column="gaode_latitude"    />
         <result property="gaodeAddress"    column="gaode_address"    />
-        <result property="questionId"    column="question_id"    />
+        <result property="questionCode"    column="question_code"    />
         <result property="source"    column="source"    />
         <result property="questionName"    column="question_name"    />
-        <result property="content"    column="content"    />
+        <result property="questionContent"    column="question_content"    />
         <result property="questionDesc"    column="question_desc"    />
         <result property="status"    column="status"    />
         <result property="checkUser"    column="check_user"    />
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gaodeLongitude"    column="gaode_longitude"    />
         <result property="gaodeLatitude"    column="gaode_latitude"    />
         <result property="gaodeAddress"    column="gaode_address"    />
-        <result property="questionId"    column="question_id"    />
+        <result property="questionCode"    column="question_code"    />
         <result property="questionName"    column="question_name"    />
         <result property="status"    column="status"    />
         <result property="inspectionCode"    column="inspection_code"    />
@@ -90,34 +90,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, tenant_id, file_code, inspection_id, file_type, file_name, file_thumbnail, file_original, file_image, file_size, latitude, longitude, location, gaode_longitude, gaode_latitude, gaode_address, question_id, source, question_name, content, question_desc, status, check_user, check_time, create_user, create_time, update_user, update_time, mark
+        id, tenant_id, file_code, inspection_id, file_type, file_name, file_thumbnail, file_original, file_image, file_size, latitude, longitude, location, gaode_longitude, gaode_latitude, gaode_address, question_code, source, question_name, question_content, question_desc, status, check_user, check_time, create_user, create_time, update_user, update_time, mark
     </sql>
 
     <sql id="selectThInspectionFileVo">
-        select id, tenant_id, file_code, inspection_id, file_type, file_name, file_thumbnail, file_original, file_image, file_size, latitude, longitude, location, gaode_longitude, gaode_latitude, gaode_address, question_id, source, question_name, content, question_desc, status, check_user, check_time, create_user, create_time, update_user, update_time, mark from th_inspection_file
+        select id, tenant_id, file_code, inspection_id, file_type, file_name, file_thumbnail, file_original, file_image, file_size, latitude, longitude, location, gaode_longitude, gaode_latitude, gaode_address, question_code, source, question_name, question_content, question_desc, status, check_user, check_time, create_user, create_time, update_user, update_time, mark from th_inspection_file
     </sql>
 
     <sql id="Base_Extend_Column_List">
         tif.id, tif.tenant_id, tif.file_code, tif.inspection_id, tif.file_type, tif.file_name, tif.file_thumbnail, tif.file_original, tif.file_image, tif.file_size,
-        tif.latitude, tif.longitude, tif.location, tif.gaode_longitude, tif.gaode_latitude, tif.gaode_address, tif.question_id, tif.source, tif.question_name, tif.content, tif.question_desc, tif.status,
+        tif.latitude, tif.longitude, tif.location, tif.gaode_longitude, tif.gaode_latitude, tif.gaode_address, tif.source, tif.question_code, tif.question_name, tif.question_content, tif.question_desc, tif.status,
         tif.check_user, tif.check_time, tif.create_user, tif.create_time, tif.update_user, tif.update_time, tif.mark,
         ti.code as inspection_code, ti.name as inspection_name, ti.road_id, ti.dept_id
     </sql>
 
     <sql id="Base_Distribution_Column_List">
-        tif.id, tif.tenant_id, tif.file_thumbnail, tif.latitude, tif.longitude, tif.location, tif.gaode_longitude, tif.gaode_latitude, tif.gaode_address, tif.question_id, tif.question_name, tif.status,
+        tif.id, tif.tenant_id, tif.file_thumbnail, tif.latitude, tif.longitude, tif.location, tif.gaode_longitude, tif.gaode_latitude, tif.gaode_address, tif.question_code, tif.question_name, tif.status,
         ti.code as inspection_code, ti.name as inspection_name
     </sql>
 
     <!-- 批量新增问题图片 -->
     <insert id="addBatch" parameterType="com.tuoheng.admin.entity.InspectionFile">
         insert into th_inspection_file (id,file_code, inspection_id, file_type, file_name,
-        file_thumbnail, file_original, file_image,
-        file_size, latitude, longitude,
-        `location`, gaode_longitude, gaode_latitude,
-        gaode_address, `source`, question_id, question_name, content,
-        question_desc, `status`, check_user,
-        check_time, create_user, tenant_id)
+        file_thumbnail, file_original, file_image, file_size, latitude, longitude, `location`, gaode_longitude, gaode_latitude,
+        gaode_address, `source`, question_code, question_name, question_content, question_desc, `status`, check_user, check_time, create_user, tenant_id)
         values
         <foreach collection="list" item="item" separator=",">
             (
@@ -137,9 +133,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.gaodeLatitude,jdbcType=VARCHAR},
             #{item.gaodeAddress,jdbcType=VARCHAR},
             #{item.source,jdbcType=BOOLEAN},
-            #{item.questionId,jdbcType=VARCHAR},
+            #{item.questionCode,jdbcType=VARCHAR},
             #{item.questionName,jdbcType=VARCHAR},
-            #{item.content,jdbcType=VARCHAR},
+            #{item.questionContent,jdbcType=VARCHAR},
             #{item.questionDesc,jdbcType=VARCHAR},
             #{item.status,jdbcType=TINYINT},
             #{item.checkUser,jdbcType=INTEGER},
@@ -182,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="1 == 1"> and mark = 1 </if>
             <if test="request.inspectionId != null and request.inspectionId != ''"> and inspection_id = #{request.inspectionId} </if>
-            <if test="request.questionId != null and request.questionId != ''"> and question_id = #{request.questionId} </if>
+            <if test="request.questionCode != null and request.questionCode != ''"> and question_Code = #{request.questionCode} </if>
             <if test="request.status != null and request.status != 0"> and status = #{request.status} </if>
         </where>
         order by create_time desc
@@ -195,7 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="1 == 1"> and tif.mark = 1 </if>
             <if test="request.key != null and request.key != 0"> and (ti.code like concat('%', #{request.key}, '%') or ti.name like concat('%', #{request.key}, '%')) </if>
-            <if test="request.questionId != null and request.questionId != ''"> and tif.question_id = #{request.questionId} </if>
+            <if test="request.questionCode != null and request.questionCode != ''"> and tif.question_Code = #{request.questionCode} </if>
             <if test="request.status != null">
                 <choose>
                     <when test="request.status != 0">
@@ -229,7 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="1 == 1"> and tif.mark = 1 </if>
             <if test="request.inspectionName != null and request.inspectionName != ''"> and ti.name like concat('%', #{request.inspectionName}, '%') </if>
-            <if test="request.questionId != null and request.questionId != ''"> and tif.question_id = #{request.questionId} </if>
+            <if test="request.questionCode != null and request.questionCode != ''"> and tif.question_code = #{request.questionCode} </if>
             <if test="request.status != null">
                 <choose>
                     <when test="request.status != 0">
@@ -256,6 +252,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null"> status = #{status}, </if>
             <if test="updateUser != null and updateUser != ''"> update_user = #{updateUser}, </if>
             <if test="updateTime != null"> update_time = #{updateTime}, </if>
+            <if test="checkUser != null and checkUser != ''"> check_user = #{checkUser}, </if>
+            <if test="checkTime != null"> check_time = #{checkTime}, </if>
         </trim>
         <where>
             <if test="idList != null and idList.size() > 0">

tuoheng-service/tuoheng-admin/src/main/resources/mapper/InspectionMapper.xml

@@ -319,8 +319,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         analyse_status       = #{analyseStatus,jdbcType=TINYINT},
         progressbar          = #{progressbar,jdbcType=DOUBLE},
         note                 = #{note,jdbcType=VARCHAR},
-        create_user          = #{createUser,jdbcType=INTEGER},
-        create_time          = #{createTime,jdbcType=TIMESTAMP},
         update_user          = #{updateUser,jdbcType=INTEGER},
         update_time          = #{updateTime,jdbcType=TIMESTAMP},
         start_longitude      = #{startLongitude,jdbcType=VARCHAR},