Merge branch 'develop' of gitadmin/tuoheng_freeway into release

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

@@ -9,7 +9,7 @@ import com.tuoheng.admin.entity.InspectionFile;
 import com.tuoheng.admin.entity.InspectionFileHandle;
 import com.tuoheng.admin.entity.Report;
 import com.tuoheng.admin.entity.User;
-import com.tuoheng.admin.enums.MarkTypeEnum;
+import com.tuoheng.admin.enums.MarkEnum;
 import com.tuoheng.admin.mapper.*;
 import com.tuoheng.admin.request.report.QueryReportPageListRequest;
 import com.tuoheng.admin.utils.CurrentUserUtil;
@@ -125,7 +125,7 @@ public class QueryReportPageListService {
             List<InspectionFile> inspectionFileList = inspectionFileMapper.selectList(Wrappers.<InspectionFile>lambdaQuery()
                     .eq(InspectionFile::getInspectionId, reportPageListVo.getInspectionId())
                     .in(InspectionFile::getStatus, GetInspectionFileStatusList.getStatusList())
-                    .eq(InspectionFile::getMark, MarkTypeEnum.VALID.getCode()));
+                    .eq(InspectionFile::getMark, MarkEnum.VALID.getCode()));
             List<String> inspectionFileIdList = null;
             if (!CollectionUtil.isEmpty(inspectionFileList)) {
                 reportPageListVo.setProblemTotalCount(inspectionFileList.size());
@@ -134,7 +134,7 @@ public class QueryReportPageListService {
             if (!CollectionUtil.isEmpty(inspectionFileIdList)) {
                 List<InspectionFileHandle> inspectionFileHandleList = inspectionFileHandleMapper.selectList(Wrappers.<InspectionFileHandle>lambdaQuery()
                         .in(InspectionFileHandle::getInspectionFileId, inspectionFileIdList)
-                        .eq(InspectionFileHandle::getMark, MarkTypeEnum.VALID.getCode()));
+                        .eq(InspectionFileHandle::getMark, MarkEnum.VALID.getCode()));
                 if (!CollectionUtil.isEmpty(inspectionFileHandleList)) {
                     reportPageListVo.setProblemHandleCount(inspectionFileHandleList.size());
                 }