Merge branch 'develop' of gitadmin/tuoheng_freeway into release

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

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

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/export/ExportInspectionFileByIdListService.java

@@ -72,7 +72,7 @@ public class ExportInspectionFileByIdListService {
         List<InspectionFile> inspectionFileList = inspectionFileMapper.selectList(Wrappers.<InspectionFile>lambdaQuery()
                 .eq(InspectionFile::getTenantId, user.getTenantId())
                 .eq(InspectionFile::getInspectionId, request.getInspectionId())
-                .eq(StringUtils.isNotEmpty(request.getQuestionId()), InspectionFile::getQuestionId, request.getQuestionId())
+                .eq(StringUtils.isNotEmpty(request.getQuestionCode()), InspectionFile::getQuestionCode, request.getQuestionCode())
                 .eq(ObjectUtil.isNotEmpty(request.getStatus()), InspectionFile::getStatus, request.getStatus())
                 .eq(InspectionFile::getMark, MarkEnum.VALID.getCode()));
         if (CollectionUtil.isEmpty(inspectionFileList)) {