Merge branch 'open_bohai' into 'master'
小区详情建筑年代使用create_year See merge request !616
This commit is contained in:
+2
-1
@@ -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);
|
||||
}
|
||||
|
||||
+2
@@ -563,6 +563,8 @@ public interface DistrictService extends ModeService<DistrictKey, DistrictBo> {
|
||||
*/
|
||||
Integer getBuildYear(District district);
|
||||
|
||||
Integer getCreateYear(District district);
|
||||
|
||||
/**
|
||||
* in查询小区信息
|
||||
*
|
||||
|
||||
+9
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user