Browse Source

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.0.0^2
chengwang 1 year ago
parent
commit
f4c61fee7d
2 changed files with 3 additions and 2 deletions
  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 View File

.eq(Inspection::getMark, 1) .eq(Inspection::getMark, 1)
.eq(Inspection::getDeptId, deptId) .eq(Inspection::getDeptId, deptId)
.eq(Inspection::getAirportId, dto.getAirportId()) .eq(Inspection::getAirportId, dto.getAirportId())
.in(Inspection::getStatus, 10, 15));
.in(Inspection::getStatus, 10, 15)
.orderByDesc(Inspection::getCreateTime));


return JsonResult.success(inspections); return JsonResult.success(inspections);
} }

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspectionfile/InspectionFileServiceImpl.java View File

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

Loading…
Cancel
Save