开发区加城市搜索条件

This commit is contained in:
majintao
2024-08-27 10:05:20 +08:00
parent cee9393eb0
commit f8f263e0ee
4 changed files with 17 additions and 6 deletions
@@ -33,9 +33,9 @@ public class DevelopmentZoneController {
if (pager.getCurrentPage() > 100) {
pager.setCurrentPage(1);
}
long countDev = developmentZoneService.countDev(model.getProvince(), model.getName(), model.getLevel());
long countDev = developmentZoneService.countDev(model.getProvince(),model.getCityName1(), model.getName(), model.getLevel());
pager.setTotalRows((int) countDev);
List<DevelopmentZone> developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getName(), model.getLevel(), pager);
List<DevelopmentZone> developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(),model.getCityName1(), model.getName(), model.getLevel(), pager);
model.setDevelopmentZoneList(developmentZones);
model.setPager(pager);
return model;
@@ -21,6 +21,9 @@
<label for="province">省份:</label>
<input type="text" name="province" id="province" class="input-medium" style="margin-top:9px;"
value="${province!}"></input>
<label for="cityName1">城市:</label>
<input type="text" name="cityName1" id="cityName1" class="input-medium" style="margin-top:9px;"
value="${cityName1!}"></input>
<label for="name">名称:</label>
<input type="text" name="name" id="name" class="input-medium" style="margin-top:9px;"
value="${name!}"></input>
@@ -51,9 +51,9 @@ public interface DevelopmentZoneService {
* @param pager
* @return
*/
public List<DevelopmentZone> findDevelopmentZone(String province,String name,String level, Pager pager);
public List<DevelopmentZone> findDevelopmentZone(String province,String city,String name,String level, Pager pager);
public long countDev(String province,String name,String level);
public long countDev(String province,String city ,String name,String level);
public List<String> findProvinces();
public List<String> findCities(String province);
@@ -41,12 +41,16 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService {
@Override
public List<DevelopmentZone> findDevelopmentZone(String province,String name,String level, Pager pager) {
public List<DevelopmentZone> findDevelopmentZone(String province,String city ,String name,String level, Pager pager) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(province)) {
Pattern pattern = Pattern.compile(".*" + province + ".*");
params.add(new QueryParam("province", pattern));
}
if (StringUtils.isNotBlank(city)) {
Pattern pattern = Pattern.compile(".*" + city + ".*");
params.add(new QueryParam("cityName1", pattern));
}
if (StringUtils.isNotBlank(name)) {
Pattern pattern = Pattern.compile(".*" + name + ".*");
@@ -61,12 +65,16 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService {
}
@Override
public long countDev(String province, String name,String level) {
public long countDev(String province,String city, String name,String level) {
List<QueryParam> params = new ArrayList<QueryParam>();
if (StringUtils.isNotBlank(province)) {
Pattern pattern = Pattern.compile(".*" + province + ".*");
params.add(new QueryParam("province", pattern));
}
if (StringUtils.isNotBlank(city)) {
Pattern pattern = Pattern.compile(".*" + city + ".*");
params.add(new QueryParam("cityName1", pattern));
}
if (StringUtils.isNotBlank(name)) {
Pattern pattern = Pattern.compile(".*" + name + ".*");