From 5761e9c774428704547179bb9054ee8bc2167d4a Mon Sep 17 00:00:00 2001 From: majintao Date: Mon, 22 Jul 2024 16:20:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=86=9C=E7=BB=93=E6=9E=9C=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkoff/controllers/VillageIdentifyController.java | 6 +++--- .../src/main/webapp/villageIdentify/importResult.ftl | 10 +++++----- .../mongo/fangjia/VillageIdentifyServiceImpl.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java index 8d9325f21..599886f43 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java @@ -48,9 +48,9 @@ public class VillageIdentifyController { List keys = Arrays.asList( "villageType", "cityParam", "address", "province", "provinceCode", "city1", "cityCode", "district", "districtCode", "town", "townCode", - "committee", "committeeCode", "type", "typeCode", "verifyFlag", "addrVerify", - "countyGov", "countyLevelCity", "administrativeTowns", "devDistrict", - "devDistrictName", "devLevel", "addrArea" + "committee", "committeeCode", "typeCode", "typeName", "verifyFlag", "addrVerify", + "countyLevelCity", "administrativeTowns", "devDistrict", + "devDistrictName", "devLevel", "countyGov", "addrArea" ); // ±éÀúkeys list²¢´ÓrowÖлñȡÏàӦµÄֵ·ÅÈëupdataÖÐ diff --git a/projects/fangjia-bkoff/src/main/webapp/villageIdentify/importResult.ftl b/projects/fangjia-bkoff/src/main/webapp/villageIdentify/importResult.ftl index eedcd681c..8886e4879 100644 --- a/projects/fangjia-bkoff/src/main/webapp/villageIdentify/importResult.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/villageIdentify/importResult.ftl @@ -66,16 +66,16 @@ 乡镇街道编码 居委 居委编码 - 城乡属性 城乡编码 + 城乡分类 涉农标识 地址验证 - 是否县政府 是否县级市 是否市辖建制镇 是否开发区 开发区名称 开发区级别 + 是否县政府 所属区域 时间 @@ -97,16 +97,16 @@ ${it.townCode!} ${it.committee!} ${it.committeeCode!} - ${it.type!} - ${it.typeCdoe!} + ${it.typeCode!} + ${it.typeName!} ${it.verifyFlag!} ${it.addrVerify!} - ${it.countyGov!} ${it.countyLevelCity!} ${it.administrativeTowns!} ${it.devDistrict!} ${it.devDistrictName!} ${it.devLevel!} + ${it.countyGov!} ${it.addrArea!} ${it.createTime?string("yyyy-MM-dd")} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/VillageIdentifyServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/VillageIdentifyServiceImpl.java index 598a1ac83..998576dd1 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/VillageIdentifyServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/VillageIdentifyServiceImpl.java @@ -34,7 +34,7 @@ public class VillageIdentifyServiceImpl implements VillageIdentifyService { } if (StringUtils.isNotBlank(city1)) { Pattern pattern = Pattern.compile(".*" + city1 + ".*"); - queryParams.add(new QueryParam("city1", pattern)); + queryParams.add(new QueryParam("cityParam", pattern)); } if (StringUtils.isNotBlank(address)) { Pattern pattern = Pattern.compile(".*" + address + ".*"); @@ -53,7 +53,7 @@ public class VillageIdentifyServiceImpl implements VillageIdentifyService { } if (StringUtils.isNotBlank(city1)) { Pattern pattern = Pattern.compile(".*" + city1 + ".*"); - queryParams.add(new QueryParam("city1", pattern)); + queryParams.add(new QueryParam("cityParam", pattern)); } if (StringUtils.isNotBlank(address)) { Pattern pattern = Pattern.compile(".*" + address + ".*");