Commit 94e6fd8a authored by wujipeng's avatar wujipeng
Browse files

优化

parent c6039ccb
...@@ -14,7 +14,7 @@ public class RoadVO extends RoadEntity { ...@@ -14,7 +14,7 @@ public class RoadVO extends RoadEntity {
/** /**
* 是否匹配到路段 * 是否匹配到路段
*/ */
private boolean found; private Boolean found;
/** /**
* 点击位置到路段的距离(单位:米) * 点击位置到路段的距离(单位:米)
*/ */
......
...@@ -85,10 +85,15 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme ...@@ -85,10 +85,15 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme
} }
if ("检测".equals(roadDTO.getType())) { if ("检测".equals(roadDTO.getType())) {
List<DefectEntity> defectList = defectService.list(new LambdaQueryWrapper<DefectEntity>() List<DefectEntity> defectList = defectService.list(new LambdaQueryWrapper<DefectEntity>()
.in(DefectEntity::getRelId, relIds).eq(DefectEntity::getType, roadDTO.getDefectType()) .in(DefectEntity::getRelId, relIds).eq(DefectEntity::getLevel, roadDTO.getLev())
.eq(DefectEntity::getLevel, roadDTO.getLev())
); );
for (DefectEntity defectEntity : defectList) { for (DefectEntity defectEntity : defectList) {
if ("结构性".equals(defectEntity.getType())) {
structuralDefect++;
} else if ("功能性".equals(defectEntity.getType())) {
functionalDefect++;
}
if(roadDTO.getDefectType().equals(defectEntity.getType())){
RoadVO roadVO = new RoadVO(); RoadVO roadVO = new RoadVO();
roadVO.setDefectType(defectEntity.getType()); roadVO.setDefectType(defectEntity.getType());
roadVO.setDefectName(defectEntity.getName()); roadVO.setDefectName(defectEntity.getName());
...@@ -96,6 +101,7 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme ...@@ -96,6 +101,7 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme
roadVO.setDefectLev(defectEntity.getLevel()); roadVO.setDefectLev(defectEntity.getLevel());
data.add(roadVO); data.add(roadVO);
} }
}
} else if ("修复".equals(roadDTO.getType())) { } else if ("修复".equals(roadDTO.getType())) {
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment