涉农调用历史结果完善

This commit is contained in:
majintao
2024-08-01 10:50:09 +08:00
parent fb79e70a67
commit 24a4fb2163
3 changed files with 19 additions and 1 deletions
@@ -609,7 +609,7 @@ public class AddrSvcController {
params.put("type", type);
params.put("showFullValue", "2");
Pager pager = new Pager(1, 1);
List<VillageIdentify> villageIdentifyList = villageIdentifyService.findAll(villageType, model.getCity(), model.getAddress(), pager);
List<VillageIdentify> villageIdentifyList = villageIdentifyService.findByCityAndAddress(villageType, model.getCity(), model.getAddress(), pager);
VillageIdentify villageResult = CollectionUtils.isNotEmpty(villageIdentifyList) ? villageIdentifyList.get(0) : null;
if (villageResult != null && StringUtils.isNotBlank(villageResult.getVerifyFlag())) {
Map<String, String> resultMap = new HashMap<String, String>();
@@ -17,5 +17,6 @@ public interface VillageIdentifyService {
int count(String villageType,String city1,String address);
List<VillageIdentify> findAll(String villageType,String city1,String address,Pager pager);
List<VillageIdentify> findByCityAndAddress(String villageType,String city1,String address,Pager pager);
}
@@ -62,6 +62,23 @@ public class VillageIdentifyServiceImpl implements VillageIdentifyService {
return villageIdentifyDao.findAllByParams(queryParams, pager.getStartRow(), pager.getPageSize());
}
@Override
public List<VillageIdentify> findByCityAndAddress(String villageType, String city1, String address, Pager pager) {
List<QueryParam> queryParams = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(villageType)) {
queryParams.add(new QueryParam("villageType", villageType));
}else {
queryParams.add(new QueryParam("villageType", "¶Ô¹«"));
}
if (StringUtils.isNotBlank(city1)) {
queryParams.add(new QueryParam("cityParam", city1));
}
if (StringUtils.isNotBlank(address)) {
queryParams.add(new QueryParam("address", address));
}
return villageIdentifyDao.findAllByParams(queryParams, pager.getStartRow(), pager.getPageSize());
}
public void setVillageIdentifyDao(VillageIdentifyDao villageIdentifyDao) {
this.villageIdentifyDao = villageIdentifyDao;
}