|
@@ -4,6 +4,7 @@ import com.nokia.finance.tasks.pojo.po.house_report.HouseBuildingIdleStrategyPo;
|
|
import lombok.Data;
|
|
import lombok.Data;
|
|
|
|
|
|
import java.text.DecimalFormat;
|
|
import java.text.DecimalFormat;
|
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
@Data
|
|
@Data
|
|
public class HouseFwxzjzmjjkclTableVo {
|
|
public class HouseFwxzjzmjjkclTableVo {
|
|
@@ -84,13 +85,13 @@ public class HouseFwxzjzmjjkclTableVo {
|
|
|
|
|
|
public HouseFwxzjzmjjkclTableVo(HouseBuildingIdleStrategyPo po) {
|
|
public HouseFwxzjzmjjkclTableVo(HouseBuildingIdleStrategyPo po) {
|
|
DecimalFormat integerFormat = new DecimalFormat("#,###");
|
|
DecimalFormat integerFormat = new DecimalFormat("#,###");
|
|
- this.areaName = po.getAreaName();
|
|
|
|
- this.cityName = po.getCityName();
|
|
|
|
- this.buildingName = po.getBuildingName();
|
|
|
|
|
|
+ this.areaName = Objects.requireNonNullElse(po.getAreaName(), "");
|
|
|
|
+ this.cityName = Objects.requireNonNullElse(po.getCityName(), "");
|
|
|
|
+ this.buildingName = Objects.requireNonNullElse(po.getBuildingName(), "");
|
|
this.houseYearBegan = po.getHouseYearBegan() == null ? "" : String.valueOf(po.getHouseYearBegan());
|
|
this.houseYearBegan = po.getHouseYearBegan() == null ? "" : String.valueOf(po.getHouseYearBegan());
|
|
- this.areaSector = po.getAreaSector();
|
|
|
|
- this.usageStatus = po.getUsageStatus();
|
|
|
|
- this.buildingUse = po.getBuildingUse();
|
|
|
|
|
|
+ this.areaSector = Objects.requireNonNullElse(po.getAreaSector(), "");
|
|
|
|
+ this.usageStatus = Objects.requireNonNullElse(po.getUsageStatus(), "");
|
|
|
|
+ this.buildingUse = Objects.requireNonNullElse(po.getBuildingUse(), "");
|
|
this.buildingArea = po.getBuildingArea() == null ? "" : integerFormat.format(po.getBuildingArea());
|
|
this.buildingArea = po.getBuildingArea() == null ? "" : integerFormat.format(po.getBuildingArea());
|
|
this.buildingAreaSelfUse = po.getBuildingAreaSelfUse() == null ? ""
|
|
this.buildingAreaSelfUse = po.getBuildingAreaSelfUse() == null ? ""
|
|
: integerFormat.format(po.getBuildingAreaSelfUse());
|
|
: integerFormat.format(po.getBuildingAreaSelfUse());
|