From 9ef4dafde6af79d1071d8c77d3cd6ee275502de0 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Sat, 6 May 2023 11:18:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E8=AF=A6=E6=83=85=E5=BB=BA?= =?UTF-8?q?=E7=AD=91=E5=B9=B4=E4=BB=A3=E4=BD=BF=E7=94=A8create=5Fyear?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/open/controllers/PropertyController.java | 3 ++- .../com/fangjia/service/datastore/DistrictService.java | 2 ++ .../fangjia/service/datastore/DistrictServiceImpl.java | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 2b86ea7e3..1a8f79ef5 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -813,7 +813,8 @@ public class PropertyController { if (district.getLoudongCount() != null && district.getLoudongCount() > 0) { districtInfoDto.setBuildingCount(district.getLoudongCount()); } - Integer finishYear = districtService.getBuildYear(district); +// Integer finishYear = districtService.getBuildYear(district); + Integer finishYear = districtService.getCreateYear(district); if (finishYear != null) { districtInfoDto.setFinishYear(finishYear); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java index b45bffb81..5c48fa0b4 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictService.java @@ -563,6 +563,8 @@ public interface DistrictService extends ModeService { */ Integer getBuildYear(District district); + Integer getCreateYear(District district); + /** * in查询小区信息 * diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java index db0bfca4b..4f9dc8686 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictServiceImpl.java @@ -2667,6 +2667,15 @@ public class DistrictServiceImpl implements DistrictService { } } + public Integer getCreateYear(District district) { + Integer buildYear = getYearFormDate(district.getCreateYear()); + int minYear = Integer.MAX_VALUE; + if (buildYear != null && buildYear < minYear) { + minYear = buildYear; + } + return minYear; + } + public Integer getBuildYear(District district) { Integer finishYear = getYearFormDate(district.getFinishBuildingDate());