update
This commit is contained in:
+13
-5
@@ -238,6 +238,14 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
|
|||||||
if(source.containsKey("root")){
|
if(source.containsKey("root")){
|
||||||
seawater.setRoot(source.getString("root"));
|
seawater.setRoot(source.getString("root"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(source.containsKey("estate_type")){
|
||||||
|
seawater.setEstateType(source.getString("estate_type"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if(source.containsKey("build_type")){
|
||||||
|
seawater.setBuildType(source.getString("build_type"));
|
||||||
|
}
|
||||||
seawaterList.add(seawater);
|
seawaterList.add(seawater);
|
||||||
}
|
}
|
||||||
return seawaterList;
|
return seawaterList;
|
||||||
@@ -386,11 +394,11 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ²»Õ¹Ê¾É¾³ý
|
// ²»Õ¹Ê¾É¾³ý
|
||||||
JSONObject param = new JSONObject();
|
// JSONObject param = new JSONObject();
|
||||||
param.put("status", 0);
|
// param.put("status", 0);
|
||||||
JSONObject temp = new JSONObject();
|
// JSONObject temp = new JSONObject();
|
||||||
temp.put("term", param);
|
// temp.put("term", param);
|
||||||
jsonList.add(temp);
|
// jsonList.add(temp);
|
||||||
|
|
||||||
query.put("must", jsonList);
|
query.put("must", jsonList);
|
||||||
q.put("bool", query);
|
q.put("bool", query);
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ public class Seawater implements SeawaterEntity {
|
|||||||
private Integer avgPrice;
|
private Integer avgPrice;
|
||||||
private String purpose;
|
private String purpose;
|
||||||
private String estateType;
|
private String estateType;
|
||||||
|
private String buildType;
|
||||||
|
|
||||||
@Id
|
@Id
|
||||||
@Column(name = "_id")
|
@Column(name = "_id")
|
||||||
@@ -305,4 +306,13 @@ public class Seawater implements SeawaterEntity {
|
|||||||
public void setEstateType(String estateType) {
|
public void setEstateType(String estateType) {
|
||||||
this.estateType = estateType;
|
this.estateType = estateType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Column(name = "build_type")
|
||||||
|
public String getBuildType() {
|
||||||
|
return buildType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setBuildType(String buildType) {
|
||||||
|
this.buildType = buildType;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+9
@@ -203,6 +203,15 @@ public class AuctionController {
|
|||||||
if(StringUtils.isNotBlank(model.getName())){
|
if(StringUtils.isNotBlank(model.getName())){
|
||||||
params.add(new QueryParam("matchName", model.getName()));
|
params.add(new QueryParam("matchName", model.getName()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Date startDate = null;
|
||||||
|
if(StringUtils.isNotBlank(model.getStartDate())){
|
||||||
|
startDate = DateUtil.parseDate(model.getStartDate(),"yyyyMMdd");
|
||||||
|
if(startDate != null){
|
||||||
|
params.add(new QueryParam("startDate", startDate));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
List<SortParam> sortParams = new ArrayList<SortParam>();
|
List<SortParam> sortParams = new ArrayList<SortParam>();
|
||||||
sortParams.add(new SortParam("startDate", false));
|
sortParams.add(new SortParam("startDate", false));
|
||||||
List<PaiMai> paimais = paiMaiService.findAll(params, sortParams, model.getLimit(), SEARCH_FIELDS);
|
List<PaiMai> paimais = paiMaiService.findAll(params, sortParams, model.getLimit(), SEARCH_FIELDS);
|
||||||
|
|||||||
+3
-1
@@ -421,7 +421,9 @@ public class HouseController {
|
|||||||
district = districtService.findDistrict(districtKey, "district");
|
district = districtService.findDistrict(districtKey, "district");
|
||||||
}else{
|
}else{
|
||||||
district = districtService.findDistrictById(model.getId());
|
district = districtService.findDistrictById(model.getId());
|
||||||
districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName());
|
if(district!=null){
|
||||||
|
districtKey = new DistrictKey(district.getCity(), district.getRegion(), district.getName());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(district == null){
|
if(district == null){
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ public class AuctionModel extends FangjiaApiModel{
|
|||||||
private Integer propertyType;
|
private Integer propertyType;
|
||||||
private Integer status;
|
private Integer status;
|
||||||
private Integer limit = 10;
|
private Integer limit = 10;
|
||||||
|
private String startDate;
|
||||||
|
|
||||||
public String getId() {
|
public String getId() {
|
||||||
return id;
|
return id;
|
||||||
@@ -130,4 +131,12 @@ public class AuctionModel extends FangjiaApiModel{
|
|||||||
public void setName(String name) {
|
public void setName(String name) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getStartDate() {
|
||||||
|
return startDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStartDate(String startDate) {
|
||||||
|
this.startDate = startDate;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user