|
@@ -79,13 +79,11 @@ public class TdtjServiceImp implements TdtjService {
|
|
// 计算闲置率
|
|
// 计算闲置率
|
|
BigDecimal totalArea = (BigDecimal) districtMap.get("totalArea");
|
|
BigDecimal totalArea = (BigDecimal) districtMap.get("totalArea");
|
|
BigDecimal confirmArea = (BigDecimal) districtMap.get("confirmArea");
|
|
BigDecimal confirmArea = (BigDecimal) districtMap.get("confirmArea");
|
|
- mapInfo.put("idleRate", totalArea.floatValue() ==
|
|
|
|
- 0 ? 0 : confirmArea.floatValue() / totalArea.floatValue());
|
|
|
|
|
|
+ mapInfo.put("idleRate", totalArea.floatValue() == 0 ? 0 : confirmArea.floatValue() / totalArea.floatValue());
|
|
|
|
|
|
// 计算处置率
|
|
// 计算处置率
|
|
BigDecimal disposalArea = (BigDecimal) districtMap.get("disposalArea");
|
|
BigDecimal disposalArea = (BigDecimal) districtMap.get("disposalArea");
|
|
- mapInfo.put("disposalRate", confirmArea.floatValue() ==
|
|
|
|
- 0 ? 0 : disposalArea.floatValue() / confirmArea.floatValue());
|
|
|
|
|
|
+ mapInfo.put("disposalRate", confirmArea.floatValue() == 0 ? 0 : disposalArea.floatValue() / confirmArea.floatValue());
|
|
|
|
|
|
listRes.add(mapInfo);
|
|
listRes.add(mapInfo);
|
|
}
|
|
}
|
|
@@ -94,6 +92,7 @@ public class TdtjServiceImp implements TdtjService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public RequestResult getReason() {
|
|
public RequestResult getReason() {
|
|
- return null;
|
|
|
|
|
|
+ List<Map<String, Object>> reasonMaps = tdgyMapper.getAreaByReason();
|
|
|
|
+ return RequestResult.success(reasonMaps);
|
|
}
|
|
}
|
|
}
|
|
}
|