Merge branch 'master' of http://gitlab.fangjia.com/dev0/main
This commit is contained in:
+16
-16
@@ -331,7 +331,7 @@ public class DistrictController {
|
|||||||
for (QueryParam pa : params) {
|
for (QueryParam pa : params) {
|
||||||
fenQiParams.add(pa);
|
fenQiParams.add(pa);
|
||||||
}
|
}
|
||||||
fenQiParams.add(new QueryParam("masterDistrictNname", "master"));
|
fenQiParams.add(new QueryParam("masterDistrame", "master"));
|
||||||
fenQiParams.add(new QueryParam("visible", 0));
|
fenQiParams.add(new QueryParam("visible", 0));
|
||||||
int fenQiCount = (int) districtService.findDistrictCount(0, fenQiParams);
|
int fenQiCount = (int) districtService.findDistrictCount(0, fenQiParams);
|
||||||
// int surplusDistrictCount =
|
// int surplusDistrictCount =
|
||||||
@@ -373,7 +373,7 @@ public class DistrictController {
|
|||||||
} else if (model.getValid() != null && model.getValid() == 3) {
|
} else if (model.getValid() != null && model.getValid() == 3) {
|
||||||
// 分期数据处理
|
// 分期数据处理
|
||||||
params.add(new QueryParam("visible", 0));
|
params.add(new QueryParam("visible", 0));
|
||||||
params.add(new QueryParam("masterDistrictNname", "master"));
|
params.add(new QueryParam("masterDistrame", "master"));
|
||||||
districts = districtService.findDistrictList(pager, params, sortParams);
|
districts = districtService.findDistrictList(pager, params, sortParams);
|
||||||
List<District> vos = new ArrayList<District>();
|
List<District> vos = new ArrayList<District>();
|
||||||
for (District district : districts) {
|
for (District district : districts) {
|
||||||
@@ -3513,8 +3513,8 @@ public class DistrictController {
|
|||||||
if (type.equals("master")) {
|
if (type.equals("master")) {
|
||||||
masterDistrict = districtService.findById(id);
|
masterDistrict = districtService.findById(id);
|
||||||
}
|
}
|
||||||
if (dis != null && dis.getMasterDistrictNname() != null
|
if (dis != null && dis.getMasterDistrictName() != null
|
||||||
&& dis.getMasterDistrictNname().equals("master")) {
|
&& dis.getMasterDistrictName().equals("master")) {
|
||||||
json.setSuccess(false);
|
json.setSuccess(false);
|
||||||
json.setMsg(dis.getName() + "已经是主小区了");
|
json.setMsg(dis.getName() + "已经是主小区了");
|
||||||
return json;
|
return json;
|
||||||
@@ -3532,13 +3532,13 @@ public class DistrictController {
|
|||||||
String type = stas[1];
|
String type = stas[1];
|
||||||
if (type.equals("master")) {
|
if (type.equals("master")) {
|
||||||
Map<String, Object> data = new HashMap<String, Object>();
|
Map<String, Object> data = new HashMap<String, Object>();
|
||||||
data.put("masterDistrictNname", "master");
|
data.put("masterDistrame", "master");
|
||||||
districtService.updateById(data, id);
|
districtService.updateById(data, id);
|
||||||
// 设置为人工操作分期标识
|
// 设置为人工操作分期标识
|
||||||
districtService.setPersonOperate(id);
|
districtService.setPersonOperate(id);
|
||||||
} else {
|
} else {
|
||||||
Map<String, Object> data = new HashMap<String, Object>();
|
Map<String, Object> data = new HashMap<String, Object>();
|
||||||
data.put("masterDistrictNname", masterDistrict.getName());
|
data.put("masterDistrame", masterDistrict.getName());
|
||||||
districtService.updateById(data, id);
|
districtService.updateById(data, id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3566,8 +3566,8 @@ public class DistrictController {
|
|||||||
json.setMsg("小区不存在,请检查是否输入正确");
|
json.setMsg("小区不存在,请检查是否输入正确");
|
||||||
return json;
|
return json;
|
||||||
}
|
}
|
||||||
if (slaveDistrict.getMasterDistrictNname() != null
|
if (slaveDistrict.getMasterDistrictName() != null
|
||||||
&& slaveDistrict.getMasterDistrictNname().equals("master")) {
|
&& slaveDistrict.getMasterDistrictName().equals("master")) {
|
||||||
json.setSuccess(false);
|
json.setSuccess(false);
|
||||||
json.setMsg(slaveDistrict.getName() + "已经是主小区了");
|
json.setMsg(slaveDistrict.getName() + "已经是主小区了");
|
||||||
return json;
|
return json;
|
||||||
@@ -3576,7 +3576,7 @@ public class DistrictController {
|
|||||||
if (slaveDistrict.getCity().equals(masterDistrict.getCity())
|
if (slaveDistrict.getCity().equals(masterDistrict.getCity())
|
||||||
&& slaveDistrict.getRegion().equals(masterDistrict.getRegion())) {
|
&& slaveDistrict.getRegion().equals(masterDistrict.getRegion())) {
|
||||||
Map<String, Object> data = new HashMap<String, Object>();
|
Map<String, Object> data = new HashMap<String, Object>();
|
||||||
data.put("masterDistrictNname", masterDistrict.getName());
|
data.put("masterDistrame", masterDistrict.getName());
|
||||||
districtService.updateById(data, slaveId);
|
districtService.updateById(data, slaveId);
|
||||||
// 设置为人工操作分期标识
|
// 设置为人工操作分期标识
|
||||||
districtService.setPersonOperate(masterDistrict.getId());
|
districtService.setPersonOperate(masterDistrict.getId());
|
||||||
@@ -3601,9 +3601,9 @@ public class DistrictController {
|
|||||||
if (model.getId() != null && !model.getId().equals("")) {
|
if (model.getId() != null && !model.getId().equals("")) {
|
||||||
District slaveDistrict = districtService.findById(model.getId());
|
District slaveDistrict = districtService.findById(model.getId());
|
||||||
District masterDistrict = districtService.findDistrict(new DistrictKey(slaveDistrict.getCity(),
|
District masterDistrict = districtService.findDistrict(new DistrictKey(slaveDistrict.getCity(),
|
||||||
slaveDistrict.getRegion(), slaveDistrict.getMasterDistrictNname()), "district");
|
slaveDistrict.getRegion(), slaveDistrict.getMasterDistrictName()), "district");
|
||||||
Map<String, Object> data = new HashMap<String, Object>();
|
Map<String, Object> data = new HashMap<String, Object>();
|
||||||
data.put("masterDistrictNname", null);
|
data.put("masterDistrame", null);
|
||||||
districtService.updateById(data, model.getId());
|
districtService.updateById(data, model.getId());
|
||||||
// 设置为人工操作分期标识
|
// 设置为人工操作分期标识
|
||||||
if (masterDistrict != null) {
|
if (masterDistrict != null) {
|
||||||
@@ -3627,7 +3627,7 @@ public class DistrictController {
|
|||||||
List<District> slaves = districtService.findSlaves(masterDistrict.getCity(), masterDistrict.getRegion(),
|
List<District> slaves = districtService.findSlaves(masterDistrict.getCity(), masterDistrict.getRegion(),
|
||||||
masterDistrict.getName());
|
masterDistrict.getName());
|
||||||
Map<String, Object> data = new HashMap<String, Object>();
|
Map<String, Object> data = new HashMap<String, Object>();
|
||||||
data.put("masterDistrictNname", null);
|
data.put("masterDistrame", null);
|
||||||
for (District district : slaves) {
|
for (District district : slaves) {
|
||||||
districtService.updateById(data, district.getId());
|
districtService.updateById(data, district.getId());
|
||||||
}
|
}
|
||||||
@@ -3654,7 +3654,7 @@ public class DistrictController {
|
|||||||
params.add(new QueryParam("visible", 0));
|
params.add(new QueryParam("visible", 0));
|
||||||
params.add(new QueryParam("city", slaveDistrict.getCity()));
|
params.add(new QueryParam("city", slaveDistrict.getCity()));
|
||||||
params.add(new QueryParam("region", slaveDistrict.getRegion()));
|
params.add(new QueryParam("region", slaveDistrict.getRegion()));
|
||||||
params.add(new QueryParam("name", slaveDistrict.getMasterDistrictNname()));
|
params.add(new QueryParam("name", slaveDistrict.getMasterDistrictName()));
|
||||||
List<District> list = districtService.findAllByParams(params);
|
List<District> list = districtService.findAllByParams(params);
|
||||||
if (list == null || list.size() == 0) {
|
if (list == null || list.size() == 0) {
|
||||||
json.setSuccess(false);
|
json.setSuccess(false);
|
||||||
@@ -3669,18 +3669,18 @@ public class DistrictController {
|
|||||||
for (District district : slaves) {
|
for (District district : slaves) {
|
||||||
if (district.getId().equals(slaveId)) {
|
if (district.getId().equals(slaveId)) {
|
||||||
Map<String, Object> data = new HashMap<String, Object>();
|
Map<String, Object> data = new HashMap<String, Object>();
|
||||||
data.put("masterDistrictNname", "master");
|
data.put("masterDistrame", "master");
|
||||||
districtService.updateById(data, district.getId());
|
districtService.updateById(data, district.getId());
|
||||||
// 设置为人工操作分期标识
|
// 设置为人工操作分期标识
|
||||||
districtService.setPersonOperate(district.getId());
|
districtService.setPersonOperate(district.getId());
|
||||||
} else {
|
} else {
|
||||||
Map<String, Object> data = new HashMap<String, Object>();
|
Map<String, Object> data = new HashMap<String, Object>();
|
||||||
data.put("masterDistrictNname", slaveDistrict.getName());
|
data.put("masterDistrame", slaveDistrict.getName());
|
||||||
districtService.updateById(data, district.getId());
|
districtService.updateById(data, district.getId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Map<String, Object> data = new HashMap<String, Object>();
|
Map<String, Object> data = new HashMap<String, Object>();
|
||||||
data.put("masterDistrictNname", slaveDistrict.getName());
|
data.put("masterDistrame", slaveDistrict.getName());
|
||||||
districtService.updateById(data, masterDistrict.getId());
|
districtService.updateById(data, masterDistrict.getId());
|
||||||
}
|
}
|
||||||
return json;
|
return json;
|
||||||
|
|||||||
Reference in New Issue
Block a user