Merge branch 'open_bohai' into 'master'

update

See merge request !315
This commit is contained in:
2022-05-26 14:28:05 +08:00
@@ -208,7 +208,7 @@ public class AuctionController {
if(StringUtils.isNotBlank(model.getStartDate())){ if(StringUtils.isNotBlank(model.getStartDate())){
startDate = DateUtil.parseDate(model.getStartDate(),"yyyyMMdd"); startDate = DateUtil.parseDate(model.getStartDate(),"yyyyMMdd");
if(startDate != null){ if(startDate != null){
params.add(new QueryParam("startDate", startDate)); params.add(new QueryParam("startDate", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startDate));
} }
} }
@@ -219,12 +219,18 @@ public class AuctionController {
for(PaiMai paiMai : paimais){ for(PaiMai paiMai : paimais){
Map<String, Object> map = standard(paiMai.getCity(), paiMai.getAddress()); Map<String, Object> map = standard(paiMai.getCity(), paiMai.getAddress());
if(map!=null){ if(map!=null){
if (map.containsKey("buildingNumber")) {
paiMai.setHouseNum((String) map.get("buildingNumber")); paiMai.setHouseNum((String) map.get("buildingNumber"));
}
if (map.containsKey("unitNumber")) {
paiMai.setUnitNum((String) map.get("unitNumber")); paiMai.setUnitNum((String) map.get("unitNumber"));
}
if (map.containsKey("roomNumber")) {
paiMai.setRoomNum((String) map.get("roomNumber")); paiMai.setRoomNum((String) map.get("roomNumber"));
} }
} }
} }
}
mav.setModel(BasicModel.buildOKModel().setResult(paimais)); mav.setModel(BasicModel.buildOKModel().setResult(paimais));
return mav; return mav;
} }