Quellcode durchsuchen

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.0.0^2
chengwang vor 1 Jahr
Ursprung
Commit
f4c61fee7d
2 geänderte Dateien mit 3 neuen und 2 gelöschten Zeilen
  1. +2
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/QueryInspectionListService.java
  2. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/InspectionFileServiceImpl.java

+ 2
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/QueryInspectionListService.java Datei anzeigen

@@ -59,7 +59,8 @@ public class QueryInspectionListService {
.eq(Inspection::getMark, 1)
.eq(Inspection::getDeptId, deptId)
.eq(Inspection::getAirportId, dto.getAirportId())
.in(Inspection::getStatus, 10, 15));
.in(Inspection::getStatus, 10, 15)
.orderByDesc(Inspection::getCreateTime));

return JsonResult.success(inspections);
}

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/InspectionFileServiceImpl.java Datei anzeigen

@@ -121,7 +121,7 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
List<InspectionFile> inspectionFileList = inspectionFileMapper.selectList(Wrappers.<InspectionFile>lambdaQuery()
.eq(InspectionFile::getMark, 1)
.eq(InspectionFile::getTenantId, tenantId));
if (null == inspectionFileList) {
if (CollectionUtil.isEmpty(inspectionFileList)) {
return JsonResult.error("该覆盖区域范围内没有问题");
}
for (InspectionFile inspectionFile : inspectionFileList) {

Laden…
Abbrechen
Speichern