From c8e077897bb2550cc160924d8e24666571eb8b3d Mon Sep 17 00:00:00 2001
From: mjt <13607600062@163.com>
Date: Wed, 19 Jun 2024 14:05:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?masterDistrame=E6=94=B9=E6=88=90masterDistr?=
=?UTF-8?q?ictName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bkoff/controllers/DistrictController.java | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
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;
From a7fa7193620a59a64b5eb10ca578a6a699f8a219 Mon Sep 17 00:00:00 2001
From: mjt <13607600062@163.com>
Date: Wed, 19 Jun 2024 14:26:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=B0=E5=9B=BEhttp=E6=94=B9=E6=88=90htt?=
=?UTF-8?q?ps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/webapp/avgPriceUpdate/guidingPrice.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/city/edit.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/city/mapcity.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/dikuai/edit.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/district/add.ftl | 4 ++--
.../fangjia-bkoff/src/main/webapp/district/editNearby.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/district/gaoDeMap.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/district/latlng.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/district/latlng2.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/district/map.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/district2/add.ftl | 2 +-
.../fangjia-bkoff/src/main/webapp/district2/addOffice.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/district2/edit.ftl | 2 +-
.../fangjia-bkoff/src/main/webapp/district2/editOffice.ftl | 2 +-
.../src/main/webapp/district2/editOfficeBorderPage.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/latlngPolygon/edit.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/latlngPolygon/show.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/loudong/edit.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/regionblock/add.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/regionblock/edit.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/regionblock/list.ftl | 2 +-
.../src/main/webapp/rentPriceUpdate/guidingPrice.ftl | 2 +-
projects/fangjia-bkoff/src/main/webapp/yugudan/add.ftl | 2 +-
23 files changed, 24 insertions(+), 24 deletions(-)
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 @@
-
+
+
+
-
+
-
-
+
+
<#---->
-
+