diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java index e579236a3..080f08f51 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java @@ -331,7 +331,7 @@ public class DistrictController { for (QueryParam pa : params) { fenQiParams.add(pa); } - fenQiParams.add(new QueryParam("masterDistrame", "master")); + fenQiParams.add(new QueryParam("masterDistrictName", "master")); fenQiParams.add(new QueryParam("visible", 0)); int fenQiCount = (int) districtService.findDistrictCount(0, fenQiParams); // int surplusDistrictCount = @@ -373,7 +373,7 @@ public class DistrictController { } else if (model.getValid() != null && model.getValid() == 3) { // 分期数据处理 params.add(new QueryParam("visible", 0)); - params.add(new QueryParam("masterDistrame", "master")); + params.add(new QueryParam("masterDistrictName", "master")); districts = districtService.findDistrictList(pager, params, sortParams); List vos = new ArrayList(); for (District district : districts) { @@ -3532,13 +3532,13 @@ public class DistrictController { String type = stas[1]; if (type.equals("master")) { Map data = new HashMap(); - data.put("masterDistrame", "master"); + data.put("masterDistrictName", "master"); districtService.updateById(data, id); // 设置为人工操作分期标识 districtService.setPersonOperate(id); } else { Map data = new HashMap(); - data.put("masterDistrame", masterDistrict.getName()); + data.put("masterDistrictName", masterDistrict.getName()); districtService.updateById(data, id); } } @@ -3576,7 +3576,7 @@ public class DistrictController { if (slaveDistrict.getCity().equals(masterDistrict.getCity()) && slaveDistrict.getRegion().equals(masterDistrict.getRegion())) { Map data = new HashMap(); - data.put("masterDistrame", masterDistrict.getName()); + data.put("masterDistrictName", masterDistrict.getName()); districtService.updateById(data, slaveId); // 设置为人工操作分期标识 districtService.setPersonOperate(masterDistrict.getId()); @@ -3603,7 +3603,7 @@ public class DistrictController { District masterDistrict = districtService.findDistrict(new DistrictKey(slaveDistrict.getCity(), slaveDistrict.getRegion(), slaveDistrict.getMasterDistrictName()), "district"); Map data = new HashMap(); - data.put("masterDistrame", null); + data.put("masterDistrictName", null); districtService.updateById(data, model.getId()); // 设置为人工操作分期标识 if (masterDistrict != null) { @@ -3627,7 +3627,7 @@ public class DistrictController { List slaves = districtService.findSlaves(masterDistrict.getCity(), masterDistrict.getRegion(), masterDistrict.getName()); Map data = new HashMap(); - data.put("masterDistrame", null); + data.put("masterDistrictName", null); for (District district : slaves) { districtService.updateById(data, district.getId()); } @@ -3669,18 +3669,18 @@ public class DistrictController { for (District district : slaves) { if (district.getId().equals(slaveId)) { Map data = new HashMap(); - data.put("masterDistrame", "master"); + data.put("masterDistrictName", "master"); districtService.updateById(data, district.getId()); // 设置为人工操作分期标识 districtService.setPersonOperate(district.getId()); } else { Map data = new HashMap(); - data.put("masterDistrame", slaveDistrict.getName()); + data.put("masterDistrictName", slaveDistrict.getName()); districtService.updateById(data, district.getId()); } } Map data = new HashMap(); - data.put("masterDistrame", slaveDistrict.getName()); + data.put("masterDistrictName", slaveDistrict.getName()); districtService.updateById(data, masterDistrict.getId()); } return json; diff --git a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/guidingPrice.ftl b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/guidingPrice.ftl index 05d865419..aa6278a15 100644 --- a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/guidingPrice.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/guidingPrice.ftl @@ -68,7 +68,7 @@ - + + + - + - - + + <#----> - + diff --git a/projects/fangjia-bkoff/src/main/webapp/district/gaoDeMap.ftl b/projects/fangjia-bkoff/src/main/webapp/district/gaoDeMap.ftl index e65316b8c..6876e9927 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/gaoDeMap.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/gaoDeMap.ftl @@ -44,7 +44,7 @@ - + +
diff --git a/projects/fangjia-bkoff/src/main/webapp/district/latlng2.ftl b/projects/fangjia-bkoff/src/main/webapp/district/latlng2.ftl index cba6a35ea..9a7dc475d 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/latlng2.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/latlng2.ftl @@ -7,7 +7,7 @@ 鐧惧害MAP <#include "/common_js.ftl" /> - + diff --git a/projects/fangjia-bkoff/src/main/webapp/district/map.ftl b/projects/fangjia-bkoff/src/main/webapp/district/map.ftl index 3d5d80901..63189a58e 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/map.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/map.ftl @@ -25,7 +25,7 @@ <#include "/common_js.ftl" /> - + <#----> - + <#----> - + <#----> - + <#----> - + + diff --git a/projects/fangjia-bkoff/src/main/webapp/latlngPolygon/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/latlngPolygon/edit.ftl index 4459b3754..e653b4063 100644 --- a/projects/fangjia-bkoff/src/main/webapp/latlngPolygon/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/latlngPolygon/edit.ftl @@ -54,7 +54,7 @@ - + diff --git a/projects/fangjia-bkoff/src/main/webapp/latlngPolygon/show.ftl b/projects/fangjia-bkoff/src/main/webapp/latlngPolygon/show.ftl index 58942ea8d..a1810a04e 100644 --- a/projects/fangjia-bkoff/src/main/webapp/latlngPolygon/show.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/latlngPolygon/show.ftl @@ -48,7 +48,7 @@ - + diff --git a/projects/fangjia-bkoff/src/main/webapp/loudong/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/loudong/edit.ftl index 65738179a..83885d5d0 100644 --- a/projects/fangjia-bkoff/src/main/webapp/loudong/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/loudong/edit.ftl @@ -274,7 +274,7 @@ - + --> - + --> - + + - + - +