Merge remote-tracking branch 'origin/master'

This commit is contained in:
majintao
2024-12-27 11:03:56 +08:00
5 changed files with 66 additions and 15 deletions
@@ -763,6 +763,27 @@ public class WeiXinEvaluationController {
}
return model;
}
// 均价对比接口(房价通小程序用)
public Object otherSourcePlusAction(EvaluationModel model){
JsonModel jsonMmodel = new JsonModel();
Map<String, Integer> dataMap = new HashMap<String, Integer>();
if(StringUtils.isNotBlank(model.getCityName()) && StringUtils.isNotBlank(model.getRegion()) && StringUtils.isNotBlank(model.getName()) && model.getBuildType() != null){
String category = getEnCategory(model.getBuildType());
AverageStatistics averageStatistics = averageStatisticsService.findOneAverageStatictics(model.getCityName(), model.getName(), category);
Integer tradeAvgPrice = dealPriceService.findDealPrices(model.getCityName(), model.getRegion(), model.getName(), DateUtil.getFirstDayOfMonth(new Date(), -6), DateUtil.getFirstDayOfMonth(new Date(), 0));
//columnX = "['成交均价(近半年)','房价网挂牌均价','搜房挂牌均价','安居客挂牌均价']";
dataMap.put("dealPrice", tradeAvgPrice);
dataMap.put("fjw", averageStatistics.getFangjiaPrice());
dataMap.put("soufang", averageStatistics.getSoufangEsfPrice());
dataMap.put("anjuke", averageStatistics.getAnjukeEsfPrice());
}
jsonMmodel.setJsonModel(dataMap);
return jsonMmodel;
}
//均价对比
public Object otherSourceAction(EvaluationModel model){
@@ -57,6 +57,9 @@ public class EvaluationModel extends BaseModel{
private Map<String, List<ReportFileAttach>> reportFileMap;
private UserTrades userTrades;
private String address;
private Integer buildType;
private String name;
private String region;
public void setId(String id) {
@@ -326,4 +329,28 @@ public class EvaluationModel extends BaseModel{
public void setLoan(Integer loan) {
this.loan = loan;
}
public Integer getBuildType() {
return buildType;
}
public void setBuildType(Integer buildType) {
this.buildType = buildType;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getRegion() {
return region;
}
public void setRegion(String region) {
this.region = region;
}
}