Commit 50babf4d authored by wujipeng's avatar wujipeng
Browse files

优化

parent d206ca46
...@@ -125,9 +125,9 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme ...@@ -125,9 +125,9 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme
if ("检测".equals(roadDTO.getType())) { if ("检测".equals(roadDTO.getType())) {
List<DefectEntity> defectList = defectService.queryByRoadName(relIds, roadDTO.getLev()); List<DefectEntity> defectList = defectService.queryByRoadName(relIds, roadDTO.getLev());
for (DefectEntity defectEntity : defectList) { for (DefectEntity defectEntity : defectList) {
if ("结构性".equals(defectEntity.getType())) { if ("结构性缺陷".equals(defectEntity.getType())) {
structuralDefect += defectEntity.getNum(); structuralDefect += defectEntity.getNum();
} else if ("功能性".equals(defectEntity.getType())) { } else if ("功能性缺陷".equals(defectEntity.getType())) {
functionalDefect += defectEntity.getNum(); functionalDefect += defectEntity.getNum();
} }
if (StrUtil.isEmpty(roadDTO.getDefectType()) || roadDTO.getDefectType().equals(defectEntity.getType())) { if (StrUtil.isEmpty(roadDTO.getDefectType()) || roadDTO.getDefectType().equals(defectEntity.getType())) {
...@@ -142,9 +142,9 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme ...@@ -142,9 +142,9 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme
} else if ("修复".equals(roadDTO.getType())) { } else if ("修复".equals(roadDTO.getType())) {
List<RepairEntity> repairList = repairService.queryByRoadName(relIds, roadDTO.getLev()); List<RepairEntity> repairList = repairService.queryByRoadName(relIds, roadDTO.getLev());
for (RepairEntity repairEntity : repairList) { for (RepairEntity repairEntity : repairList) {
if ("结构性".equals(repairEntity.getType())) { if ("结构性缺陷".equals(repairEntity.getType())) {
structuralDefect += repairEntity.getNum(); structuralDefect += repairEntity.getNum();
} else if ("功能性".equals(repairEntity.getType())) { } else if ("功能性缺陷".equals(repairEntity.getType())) {
functionalDefect += repairEntity.getNum(); functionalDefect += repairEntity.getNum();
} }
if (StrUtil.isEmpty(roadDTO.getDefectType()) || roadDTO.getDefectType().equals(repairEntity.getType())) { if (StrUtil.isEmpty(roadDTO.getDefectType()) || roadDTO.getDefectType().equals(repairEntity.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