This commit is contained in:
2024-06-19 14:27:11 +08:00
24 changed files with 34 additions and 34 deletions
@@ -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<District> vos = new ArrayList<District>();
for (District district : districts) {
@@ -3532,13 +3532,13 @@ public class DistrictController {
String type = stas[1];
if (type.equals("master")) {
Map<String, Object> data = new HashMap<String, Object>();
data.put("masterDistrame", "master");
data.put("masterDistrictName", "master");
districtService.updateById(data, id);
// 设置为人工操作分期标识
districtService.setPersonOperate(id);
} else {
Map<String, Object> data = new HashMap<String, Object>();
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<String, Object> data = new HashMap<String, Object>();
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<String, Object> data = new HashMap<String, Object>();
data.put("masterDistrame", null);
data.put("masterDistrictName", null);
districtService.updateById(data, model.getId());
// 设置为人工操作分期标识
if (masterDistrict != null) {
@@ -3627,7 +3627,7 @@ public class DistrictController {
List<District> slaves = districtService.findSlaves(masterDistrict.getCity(), masterDistrict.getRegion(),
masterDistrict.getName());
Map<String, Object> data = new HashMap<String, Object>();
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<String, Object> data = new HashMap<String, Object>();
data.put("masterDistrame", "master");
data.put("masterDistrictName", "master");
districtService.updateById(data, district.getId());
// 设置为人工操作分期标识
districtService.setPersonOperate(district.getId());
} else {
Map<String, Object> data = new HashMap<String, Object>();
data.put("masterDistrame", slaveDistrict.getName());
data.put("masterDistrictName", slaveDistrict.getName());
districtService.updateById(data, district.getId());
}
}
Map<String, Object> data = new HashMap<String, Object>();
data.put("masterDistrame", slaveDistrict.getName());
data.put("masterDistrictName", slaveDistrict.getName());
districtService.updateById(data, masterDistrict.getId());
}
return json;
@@ -68,7 +68,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script charset="utf-8" src="http://map.qq.com/api/js?v=2.exp&key=5fc2a1dec61fbd1df575a0967b87aa20"></script>
<script type="text/javascript">
@@ -153,7 +153,7 @@ table{text-align: left;}
</div>
<div id="popMap" style="position:absolute;top:150px;left:50%;margin-left:-400px;border:1px solid #DADADA;padding:8px;z-index:999999;background:#F5F5F5;display:none;"></div>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
function selectCity(id, display) {
if(typeof(display) == 'undefined' || display == 'undefined') {
@@ -25,7 +25,7 @@
<#include "/common_js.ftl" />
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script>
var map = new BMap.Map("map");
var city='${cityName!""}'
@@ -331,7 +331,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script charset="utf-8" src="http://map.qq.com/api/js?v=2.exp&key=5fc2a1dec61fbd1df575a0967b87aa20"></script>
<script type="text/javascript">
@@ -642,8 +642,8 @@
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="../js/numValidator.js"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.3&key=65d0404c8a96fc2a630d9621c10c25bf"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.3&key=65d0404c8a96fc2a630d9621c10c25bf"></script>
<script type="text/javascript">
$(document).ready(function(){
@@ -111,7 +111,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="../js/numValidator.js"></script>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
</script>
</body>
@@ -44,7 +44,7 @@
<input type="text" id="seaAddress2" />
<input type="button" id="btn_sea2" value="查询" />
</div>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.3&key=65d0404c8a96fc2a630d9621c10c25bf"></script>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.3&key=65d0404c8a96fc2a630d9621c10c25bf"></script>
<script type="text/javascript" src="http://cache.amap.com/lbs/static/addToolbar.js"></script>
<script>
//debugger;
@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>百度MAP</title>
<#include "/common_js.ftl" />
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
</head>
<body>
<form action="latlng">
@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>百度MAP</title>
<#include "/common_js.ftl" />
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
</head>
<body>
@@ -25,7 +25,7 @@
<#include "/common_js.ftl" />
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script>
var map = new BMap.Map("map");
var point ;
@@ -374,7 +374,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="../js/numValidator.js"></script>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
$(document).ready(function(){
KindEditor.ready(function(K) {
@@ -589,7 +589,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="../js/numValidator.js"></script>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
function estateTypeChange(){
var estateType2=$("#estateType2").val();
@@ -788,7 +788,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="../js/numValidator.js"></script>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
$(document).ready(function(){
KindEditor.ready(function(K) {
@@ -1113,7 +1113,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="../js/numValidator.js"></script>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
function estateTypeChange(){
var estateType2=$("#estateType2").val();
@@ -26,7 +26,7 @@
</p>
</div>
<div id="allmap" style="width:1160px;height:700px;margin-top:20px;"></div>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<!--加载鼠标绘制工具-->
<script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
<link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" />
@@ -54,7 +54,7 @@
</div>
</div>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<!--加载鼠标绘制工具-->
<script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
<link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" />
@@ -48,7 +48,7 @@
</div>
</div>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<!--加载鼠标绘制工具-->
<script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
<link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" />
@@ -274,7 +274,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script charset="utf-8" src="http://map.qq.com/api/js?v=2.exp&key=5fc2a1dec61fbd1df575a0967b87aa20"></script>
<script type="text/javascript">
$(document).ready(function(){
@@ -162,7 +162,7 @@
<div id="popMap" style="position:absolute;top:150px;left:50%;margin-left:-400px;border:1px solid #DADADA;padding:8px;z-index:999999;background:#F5F5F5;display:none;"></div>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
$(document).ready(function(){
$("#lineForm").submit(function(){
@@ -193,7 +193,7 @@
<div id="popMap" style="position:absolute;top:150px;left:50%;margin-left:-400px;border:1px solid #DADADA;padding:8px;z-index:999999;background:#F5F5F5;display:none;"></div>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
$(document).ready(function(){
$("#lineForm").submit(function(){
@@ -178,7 +178,7 @@
<div id="popMap" style="position:fixed;bottom:150px;right:10px;border:1px solid #DADADA;padding:8px;z-index:999999;background:#F5F5F5;display:none;"></div>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="${staticUrl}/js/fangjia/jquery.editable.js?v=${version}"></script>
<script type="text/javascript">
var regionData = {}
@@ -68,7 +68,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script charset="utf-8" src="http://map.qq.com/api/js?v=2.exp&key=5fc2a1dec61fbd1df575a0967b87aa20"></script>
<script type="text/javascript">
@@ -1085,7 +1085,7 @@ html {
<script type="text/javascript" src="../js/numValidator.js"></script>
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<script type="text/javascript" src="../js/jquery.MultiFile.pack.js"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
var selectRegion = '${region!}';
var city = '${cityDisplay!}';