From b0eaa0460250f60683fea9e465306c14ea48b85e Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Wed, 19 Jun 2024 13:58:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?getMasterDistrictNname=20=E6=94=B9=E4=B8=BA?= =?UTF-8?q?getMasterDistrictNname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkoff/controllers/DistrictController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 db5bf7e45..db63856fa 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 @@ -3513,8 +3513,8 @@ public class DistrictController { if (type.equals("master")) { masterDistrict = districtService.findById(id); } - if (dis != null && dis.getMasterDistrictNname() != null - && dis.getMasterDistrictNname().equals("master")) { + if (dis != null && dis.getMasterDistrictName() != null + && dis.getMasterDistrictName().equals("master")) { json.setSuccess(false); json.setMsg(dis.getName() + "已经是主小区了"); return json; @@ -3566,8 +3566,8 @@ public class DistrictController { json.setMsg("小区不存在,请检查是否输入正确"); return json; } - if (slaveDistrict.getMasterDistrictNname() != null - && slaveDistrict.getMasterDistrictNname().equals("master")) { + if (slaveDistrict.getMasterDistrictName() != null + && slaveDistrict.getMasterDistrictName().equals("master")) { json.setSuccess(false); json.setMsg(slaveDistrict.getName() + "已经是主小区了"); return json; @@ -3601,7 +3601,7 @@ public class DistrictController { if (model.getId() != null && !model.getId().equals("")) { District slaveDistrict = districtService.findById(model.getId()); District masterDistrict = districtService.findDistrict(new DistrictKey(slaveDistrict.getCity(), - slaveDistrict.getRegion(), slaveDistrict.getMasterDistrictNname()), "district"); + slaveDistrict.getRegion(), slaveDistrict.getMasterDistrictName()), "district"); Map data = new HashMap(); data.put("masterDistrictNname", null); districtService.updateById(data, model.getId()); @@ -3654,7 +3654,7 @@ public class DistrictController { params.add(new QueryParam("visible", 0)); params.add(new QueryParam("city", slaveDistrict.getCity())); params.add(new QueryParam("region", slaveDistrict.getRegion())); - params.add(new QueryParam("name", slaveDistrict.getMasterDistrictNname())); + params.add(new QueryParam("name", slaveDistrict.getMasterDistrictName())); List list = districtService.findAllByParams(params); if (list == null || list.size() == 0) { json.setSuccess(false); From 1865038efe4b98bde8f723bbb92163a13e22ffda Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Wed, 19 Jun 2024 14:00:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?getMasterDistrictNname=20=E6=94=B9=E4=B8=BA?= =?UTF-8?q?getMasterDistrictNname?= 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 db63856fa..e579236a3 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("masterDistrictNname", "master")); + fenQiParams.add(new QueryParam("masterDistrame", "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("masterDistrictNname", "master")); + params.add(new QueryParam("masterDistrame", "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("masterDistrictNname", "master"); + data.put("masterDistrame", "master"); districtService.updateById(data, id); // 设置为人工操作分期标识 districtService.setPersonOperate(id); } else { Map data = new HashMap(); - data.put("masterDistrictNname", masterDistrict.getName()); + data.put("masterDistrame", 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("masterDistrictNname", masterDistrict.getName()); + data.put("masterDistrame", 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("masterDistrictNname", null); + data.put("masterDistrame", 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("masterDistrictNname", null); + data.put("masterDistrame", 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("masterDistrictNname", "master"); + data.put("masterDistrame", "master"); districtService.updateById(data, district.getId()); // 设置为人工操作分期标识 districtService.setPersonOperate(district.getId()); } else { Map data = new HashMap(); - data.put("masterDistrictNname", slaveDistrict.getName()); + data.put("masterDistrame", slaveDistrict.getName()); districtService.updateById(data, district.getId()); } } Map data = new HashMap(); - data.put("masterDistrictNname", slaveDistrict.getName()); + data.put("masterDistrame", slaveDistrict.getName()); districtService.updateById(data, masterDistrict.getId()); } return json;