修复无默认值BUG
This commit is contained in:
+24
-22
@@ -157,32 +157,34 @@ public class OfficeServiceImpl implements OfficeService {
|
||||
query.setPager(pager);
|
||||
query.setTable("latest_seawater");
|
||||
seawaters = seawaterService.findSeawatersByQuery(query);
|
||||
for (Seawater seawater : seawaters) {
|
||||
boolean sameFloorDesc = false;
|
||||
if (StringUtils.isNotBlank(query.getFitment()) && StringUtils.isNotBlank(query.getDirection())) {
|
||||
for (Seawater seawater : seawaters) {
|
||||
boolean sameFloorDesc = false;
|
||||
|
||||
if (seawater.getFloorInfo() != null && floorDesc != null) {
|
||||
if (seawater.getFloorInfo().contains(floorDesc)) {
|
||||
sameFloorDesc = true;
|
||||
} else {
|
||||
try {
|
||||
Integer floor = Integer.parseInt(seawater.getFloorInfo());
|
||||
if (floor <= 6 && "低".equals(floorDesc)) {
|
||||
sameFloorDesc = true;
|
||||
} else if (floor > 6 && floor <= 15 && "中".equals(floorDesc)) {
|
||||
sameFloorDesc = true;
|
||||
} else if (floor > 15 && "高".equals(floorDesc)) {
|
||||
sameFloorDesc = true;
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
|
||||
if (seawater.getFloorInfo() != null) {
|
||||
if (seawater.getFloorInfo().contains(floorDesc)) {
|
||||
sameFloorDesc = true;
|
||||
} else {
|
||||
try {
|
||||
Integer floor = Integer.parseInt(seawater.getFloorInfo());
|
||||
if (floor <= 6 && "低".equals(floorDesc)) {
|
||||
sameFloorDesc = true;
|
||||
} else if (floor > 6 && floor <= 15 && "中".equals(floorDesc)) {
|
||||
sameFloorDesc = true;
|
||||
} else if (floor > 15 && "高".equals(floorDesc)) {
|
||||
sameFloorDesc = true;
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
if (sameFloorDesc) {
|
||||
selectedSeawaters.add(seawater);
|
||||
}
|
||||
if (selectedSeawaters.size() == 3) {
|
||||
return getOfficeEvaluationDto(selectedSeawaters, evaluation);
|
||||
if (sameFloorDesc) {
|
||||
selectedSeawaters.add(seawater);
|
||||
}
|
||||
if (selectedSeawaters.size() == 3) {
|
||||
return getOfficeEvaluationDto(selectedSeawaters, evaluation);
|
||||
}
|
||||
}
|
||||
}
|
||||
// 查找基准价
|
||||
|
||||
Reference in New Issue
Block a user