Commit ade2f0e9 authored by lixuan's avatar lixuan

feat: 房源

parent 44ed4bdc
Pipeline #145465 failed with stages
...@@ -83,4 +83,10 @@ public class HouseResourceExport { ...@@ -83,4 +83,10 @@ public class HouseResourceExport {
@Excel(name = "2025营收") @Excel(name = "2025营收")
private BigDecimal YearSell2025; private BigDecimal YearSell2025;
@Excel(name = "经营(办公)场所图片")
private String houseResourceUrl;
@Excel(name = "营业执照图片")
private String businessLicenseUrl;
} }
...@@ -311,6 +311,12 @@ public class HouseResourceServiceImpl implements HouseResourceService { ...@@ -311,6 +311,12 @@ public class HouseResourceServiceImpl implements HouseResourceService {
x.setYearSell2024(businessEntitySell2024.getYearSell()); x.setYearSell2024(businessEntitySell2024.getYearSell());
} }
} }
BusinessEntitySell businessEntitySell2025 = businessEntitySellMapper.selectBusinessEntitySellByBusinessEntityInfoId(x.getBusinessEntityInfoId(), 2025);
if (Objects.nonNull(businessEntitySell2025)) {
if (Objects.nonNull(businessEntitySell2025.getYearSell())) {
x.setYearSell2025(businessEntitySell2025.getYearSell());
}
}
}); });
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return Collections.emptyList(); return Collections.emptyList();
......
...@@ -443,7 +443,9 @@ ...@@ -443,7 +443,9 @@
t1.remark, t1.remark,
t3.name AS businessEntityInfoName, t3.name AS businessEntityInfoName,
t3.principal, t3.principal,
ROUND(IFNULL(t1.unit_price,0) * 10000 / 365 / t1.house_area, 1) AS dayPrice ROUND(IFNULL(t1.unit_price,0) * 10000 / 365 / t1.house_area, 1) AS dayPrice,
t1.house_resource_url,
t1.business_license_url
FROM FROM
house_resource t1 house_resource t1
LEFT JOIN grid_region t2 ON t2.wg_code = t1.four LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
......
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