This commit is contained in:
2023-07-21 18:16:07 +08:00
32 changed files with 820 additions and 488 deletions
@@ -618,8 +618,9 @@ public class DataController {
System.out.println ( "IOException." + e );
} finally {
try {
if (os != null)
if(os != null) {
os.close();
}
if(fos != null){
fos.close();
}
@@ -840,21 +841,40 @@ public class DataController {
HSSFRow onerow = s.createRow(0);
int oneRowIndex = 0;
Map displayMap = getFliedDisplay();
for(String key : outfields){
if(cat.equals("商铺")){
if(key.equals("bedKind")){
continue;
}
}
String display = (String) displayMap.get(key);
if(StringUtils.isNotBlank(display)){
onerow.createCell((short)oneRowIndex).setCellValue(display);
}else{
onerow.createCell((short)oneRowIndex).setCellValue(key);
}
oneRowIndex ++;
}
Map displayMap = getFliedDisplay(cat);
/*
以displayMap为准 移除outfields中多余字段
*/
Iterator<String> it = outfields.iterator();
while(it.hasNext()) {
String key = it.next();
String display = (String) displayMap.get(key);
if (StringUtils.isNotBlank(display)) {
onerow.createCell((short)oneRowIndex).setCellValue(display);
oneRowIndex ++;
}else{
it.remove();
}
}
//因 写字楼导出仅展示写字楼后台的字段需求 改动
// for(String key : outfields){
// if(cat.equals("商铺")){
// if(key.equals("bedKind")){
// continue;
// }
// }
// String display = (String) displayMap.get(key);
// if(StringUtils.isNotBlank(display)){
// onerow.createCell((short)oneRowIndex).setCellValue(display);
// }else{
// onerow.createCell((short)oneRowIndex).setCellValue(key);
// }
// oneRowIndex ++;
// }
for(Map<String, Object> map : list){
HSSFRow row = s.createRow(s.getPhysicalNumberOfRows());
@@ -891,151 +911,236 @@ public class DataController {
return wb;
}
public Map<String, String> getFliedDisplay(){
public Map<String, String> getFliedDisplay(String cat){
Map<String, String> map = new HashMap<String, String>(){ {
put( "province" , "省份" );
put( "city" , "城市" );
put( "cityLevel" , "城市等级" );
put( "rankingLevel" , "行政区划" );
put( "existingDistrictCount" , "小区数量" );
put( "districtsHasLoudong" , "有楼栋的小区数量" );
put( "districtsHasFanghao" , "有房号的小区数量" );
put( "existingOfficeCount" , "写字楼数量" );
put( "existingShopCount" , "商铺数量" );
put( "priceCoverage" , "价格覆盖率" );
put( "priceCreditGte80Coverage", "0.8≤价格可信度");
put( "priceCreditGte66Coverage", "0.66≤价格可信度<0.8");
put( "priceCreditGte60Coverage", "0.6≤价格可信度<0.66");
put( "priceCreditGte00Coverage", "价格可信度<0.6");
put( "name" , "名称" );
put( "region" , "区域" );
put( "block" , "板块" );
put( "address" , "地址" );
put( "estateType" , "物业类型" );
put( "householdCount" , "户数" );
put( "openDate" , "开盘时间" );
put( "latLng" , "mapabc经纬度" );
put( "latLng2" , "百度经纬度" );
put( "allArea" , "占地面积" );
put( "buildArea" , "建筑面积" );
put( "buildType" , "建筑类型" );
put( "developer" , "开发商" );
put( "estateCompany" , "物业公司" );
put( "cubagePercent" , "容积率" );
put( "virescencePercent" , "绿化率" );
put( "carSite" , "停车位" );
put( "carSiteCount" , "停车位描述" );
put( "estateCharge" , "物业费" );
put( "floorplanPics" , "楼层平面图" );
put( "outPics" , "外景图" );
put( "rentPrice" , "租金" );
put( "bedKind" , "写字楼等级" );
put( "houseFloor" , "楼层" );
put( "houseHeight" , "楼高" );
put( "houseArea" , "面积" );
put( "room" , "室" );
put( "hall" , "厅" );
put( "direction" , "朝向" );
put( "toilet" , "卫" );
put( "noise" , "噪音" );
put( "fitmentRank" , "装修" );
put( "fitmentAge" , "装修年限" );
put( "leaseTerm","租赁年限");
put( "paymentPattern","付款方式");
put( "rentPrice","出租价格");
put( "sellPrice","出售价格");
put( "mobile","电话");
put( "floor","建筑楼层");
put( "floorInfo","楼层状况");
put( "bayArea","开间面积");
put( "finishBuildingDate","竣工时间");
put( "liveDate","开业时间");
put( "divisible","是否可分割");
put( "unifiedManage","是否统一管理");
put( "metroInfo","地铁沿线");
put( "metroNames","地铁站名");
put( "facilities","配套设施");
put( "propertyInfo","物业概况");
put( "traffic","交通情况");
put( "surrounding","周边情况");
put( "businessStatus","经营业态");
put( "rentType","租售类型");
put( "price","价格");
put( "businessQuarter","商圈");
put( "startBuildingDate","开工时间");
put( "liveDate","交房时间");
put( "loopLineInfo","环线");
put( "propertyLife","产权年限");
put( "houseProperty","产权性质");
put( "licence","预售许可证");
put( "buildStructure","建筑结构");
put( "house_count","房号总量");
put( "exists_house_dis_count","有房号的小区数量");
put( "house_num_rate","楼号覆盖率");
put( "unit_num_rate","单元覆盖率");
put( "room_num_rate","室号覆盖率");
put( "area_rate","面积覆盖率");
put( "room_info_rate","户型覆盖率");
put( "hourse_structure_rate","户型结构覆盖率");
put( "actualFloor","实际层覆盖率");
put( "nominalFloor","名义层覆盖率");
put( "build_type","建筑类型覆盖率");
put( "loudong_count","楼栋总量");
put( "exists_loudong_dis_count","有楼栋的小区数量");
put( "loudong_num_rate","楼栋号覆盖率");
put( "loudong_height_rate","总楼层覆盖率");
put( "elevatornumber_rate","电梯数覆盖率");
put( "households_rate","户数覆盖率");
put( "address_rate","地址覆盖率");
put( "structure_rate","建筑结构覆盖率");
put( "build_year_rate","建筑年代覆盖率");
put( "usage_rate","楼栋用途覆盖率");
put( "loudong_type_rate","楼栋类型覆盖率");
put( "floor_type_reate","建筑类型(按楼层)覆盖率");
put( "archiNature_rate","建筑性质覆盖率");
put( "totalAreas_rate","建筑总面积覆盖率");
put("streetCommunity","街道社区");
put("committee","居委会");
put("schools","对口学校");
put("houseStructure","房屋结构");
put("estateType2","物业类型");
put("buildDate","建筑年代");
put("alias","别名");
put("addrAlias","地址别名");
put("mainTypeArea","主力面积");
put("loudongCount","楼栋数");
put("township","乡镇街道");
put("schools","对口小学");
put("kindergartens","对口幼儿园");
put("elevator","电梯");
put("landProperty","权属类别");
put("usageCard","土地使用权证号");
put("landUsageStart","土地使用年限");
put("occupancyRate","入住率");
put("mainType","主力户型");
put("mappingAlias","映射别名");
put("districtAliasTotalCount", "别名总量");
put( "latLng" , "mapabc经纬度" );
put( "latLng2" , "百度经纬度" );
put("undergroundCarSite", "地下车位数");
put("landCarSite", "地上车位数");
put("parkingFee", "车位月租金");
put("sight", "开间面积");
put("lobbyHeight", "大堂层高");
put("standardHeight", "标准层高");
put("clearHeight", "净高");
put("standardArea", "标准层面积");
put("foreign", "是否涉外");
put("register", "是否可注册");
put("divisible", "是否可分割");
put("elevatorsCount","电梯数量");
put("personElevatorsCount","客梯数");
put("goodsElevatorCount","货梯数");
put("realUsePercent","得房率");
put("landFloor","地上层数");
put("undergroundFloor","地下层数");
// put( "floorplanPics" , "楼层平面图" );
// put( "outPics" , "外景图" );
// put( "rentPrice" , "租金" );
// put( "houseFloor" , "楼层" );
// put( "houseHeight" , "楼高" );
// put( "houseArea" , "面积" );
// put( "room" , "室" );
// put( "hall" , "厅" );
// put( "direction" , "朝向" );
// put( "toilet" , "卫" );
// put( "noise" , "噪音" );
// put( "fitmentRank" , "装修" );
// put( "fitmentAge" , "装修年限" );
// put( "leaseTerm","租赁年限");
// put( "paymentPattern","付款方式");
// put( "sellPrice","出售价格");
// put( "mobile","电话");
// put( "liveDate","开业时间");
// put( "divisible","是否可分割");
// put( "unifiedManage","是否统一管理");
// put( "metroInfo","地铁沿线");
// put( "metroNames","地铁站名");
// put( "facilities","配套设施");
// put( "propertyInfo","物业概况");
// put( "traffic","交通情况");
// put( "surrounding","周边情况");
// put( "rentType","租售类型");
// put( "price","价格");
// put("schools","对口学校");
// put("estateType" , "物业类型" );
// put("estateType2","物业类型");
// put("buildDate","建筑年代");
} };//
if(cat.equals("小区")){
map = setDistrictFields(map);
}else if(cat.equals("写字楼")){
map = setOfficeFields(map);
}else if(cat.equals("房号")){
map = setRoomNumberFields(map);
}else if(cat.equals("商铺")){
map = setShopsFields(map);
}else if(cat.equals("楼栋")){
map = setBuildingFields(map);
}
return map;
}
private Map setDistrictFields (Map map){
map.put( "existingDistrictCount" , "小区数量" );
map.put( "districtsHasLoudong" , "有楼栋的小区数量" );
map.put( "districtsHasFanghao" , "有房号的小区数量" );
map.put( "priceCoverage" , "价格覆盖率" );
map.put("districtAliasTotalCount", "别名总量");
map.put( "priceCreditGte80Coverage", "0.8≤价格可信度");
map.put( "priceCreditGte66Coverage", "0.66≤价格可信度<0.8");
map.put( "priceCreditGte60Coverage", "0.6≤价格可信度<0.66");
map.put( "priceCreditGte00Coverage", "价格可信度<0.6");
map.put( "businessQuarter","商圈");
map.put( "startBuildingDate","开工时间");
map.put( "liveDate","交房时间");
map.put( "loopLineInfo","环线");
map.put( "propertyLife","产权年限");
map.put( "houseProperty","产权性质");
map.put( "licence","预售许可证");
map.put( "buildStructure","建筑结构");
map.put( "name" , "名称" );
map.put( "region" , "区域" );
map.put( "block" , "板块" );
map.put( "address" , "地址" );
map.put( "estateType2" , "物业类型" );
map.put( "householdCount" , "户数" );
map.put( "openDate" , "开盘时间" );
map.put("buildDate","建筑年代");
map.put( "allArea" , "占地面积" );
map.put( "buildArea" , "建筑面积" );
map.put( "buildType" , "建筑类型" );
map.put( "developer" , "开发商" );
map.put( "estateCompany" , "物业公司" );
map.put( "cubagePercent" , "容积率" );
map.put( "virescencePercent" , "绿化率" );
map.put( "carSite" , "停车位" );
map.put( "estateCharge" , "物业费" );
map.put( "finishBuildingDate","竣工时间");
map.put("streetCommunity","街道社区");
map.put("committee","居委会");
map.put("schools","对口小学");
map.put("houseStructure","房屋结构");
map.put("alias","别名");
map.put("addrAlias","地址别名");
map.put("mainTypeArea","主力面积");
map.put("loudongCount","楼栋数");
map.put( "carSiteCount" , "停车位描述" );
map.put("mappingAlias","映射别名");
map.put("elevator","电梯");
map.put("township","乡镇街道");
map.put("kindergartens","对口幼儿园");
map.put("mainType","主力户型");
map.put("landProperty","权属类别");
map.put("usageCard","土地使用权证号");
map.put("occupancyRate","入住率");
map.put("landUsageStart","土地使用年限");
map.put( "rentPrice","出租价格");
map.put("realUsePercent","得房率");
return map;
}
private Map setOfficeFields (Map map){
map.put( "existingOfficeCount" , "写字楼数量" );
map.put( "name" , "名称" );
map.put( "region" , "区域" );
map.put( "block" , "板块" );
map.put( "address" , "地址" );
// map.put( "estateType2" , "物业类型" );
// map.put( "openDate" , "开盘时间" );
// map.put( "liveDate","交房时间");
map.put( "allArea" , "占地面积" );
map.put( "buildArea" , "建筑面积" );
// map.put( "buildType" , "建筑类型" );
map.put( "developer" , "开发商" );
map.put( "estateCompany" , "物业公司" );
map.put( "cubagePercent" , "容积率" );
map.put( "virescencePercent" , "绿化率" );
map.put( "carSite" , "停车位" );
map.put( "estateCharge" , "物业费" );
map.put( "finishBuildingDate","竣工时间");
// map.put( "startBuildingDate","开工时间");
// map.put( "carSiteCount" , "停车位描述" );
map.put( "bedKind" , "写字楼等级" );
map.put("alias","别名");
map.put("addrAlias","地址别名");
// map.put( "businessQuarter","商圈");
map.put( "loopLineInfo","环线");
// map.put( "floorInfo","楼层状况");
map.put("undergroundCarSite", "地下车位数");
map.put("landCarSite", "地上车位数");
map.put("parkingFee", "车位月租金");
map.put( "bayArea","开间面积");
map.put( "propertyLife","产权年限");
map.put("elevatorsCount","电梯数量");
map.put("personElevatorsCount","客梯数");
map.put("goodsElevatorCount","货梯数");
map.put("standardHeight", "标准层高");
map.put("clearHeight", "净高");
map.put("standardArea", "标准层面积");
map.put("foreign", "是否涉外");
map.put("register", "是否可注册");
map.put("lobbyHeight", "大堂层高");
// map.put("township","乡镇街道");
map.put("divisible", "是否可分割");
map.put("landFloor","地上层数");
map.put("undergroundFloor","地下层数");
return map;
}
private Map setRoomNumberFields (Map map){
map.put( "house_count","房号总量");
map.put( "exists_house_dis_count","有房号的小区数量");
map.put( "house_num_rate","楼号覆盖率");
map.put( "unit_num_rate","单元覆盖率");
map.put( "room_num_rate","室号覆盖率");
map.put( "area_rate","面积覆盖率");
map.put( "room_info_rate","户型覆盖率");
map.put( "hourse_structure_rate","户型结构覆盖率");
map.put( "actualFloor","实际层覆盖率");
map.put( "nominalFloor","名义层覆盖率");
map.put( "build_type","建筑类型覆盖率");
return map;
}
private Map setShopsFields (Map map){
map.put( "existingShopCount" , "商铺数量" );
map.put( "name" , "名称" );
map.put( "region" , "区域" );
map.put( "block" , "板块" );
map.put( "address" , "地址" );
map.put("alias","别名");
map.put("addrAlias","地址别名");
map.put( "estateType2" , "物业类型" );
map.put( "openDate" , "开盘时间" );
map.put( "liveDate","交房时间");
map.put( "allArea" , "占地面积" );
map.put( "buildArea" , "建筑面积" );
map.put( "buildType" , "建筑类型" );
map.put( "developer" , "开发商" );
map.put( "estateCompany" , "物业公司" );
map.put( "carSite" , "停车位" );
map.put( "estateCharge" , "物业费" );
map.put( "floor","建筑楼层");
map.put( "finishBuildingDate","竣工时间");
map.put( "businessQuarter","商圈");
map.put( "startBuildingDate","开工时间");
map.put("sight", "开间面积");
map.put( "propertyLife","产权年限");
map.put( "businessStatus","经营业态");
map.put("parkingFee", "车位月租金");
map.put("township","乡镇街道");
map.put( "loopLineInfo","环线");
map.put("landFloor","地上层数");
map.put("undergroundFloor","地下层数");
return map;
}
private Map setBuildingFields (Map map){
map.put( "loudong_count","楼栋总量");
map.put( "exists_loudong_dis_count","有楼栋的小区数量");
map.put( "unit_num_rate","单元覆盖率");
map.put( "loudong_num_rate","楼栋号覆盖率");
map.put( "loudong_height_rate","总楼层覆盖率");
map.put( "elevatornumber_rate","电梯数覆盖率");
map.put( "households_rate","户数覆盖率");
map.put( "address_rate","地址覆盖率");
map.put( "structure_rate","建筑结构覆盖率");
map.put( "build_year_rate","建筑年代覆盖率");
map.put( "usage_rate","楼栋用途覆盖率");
map.put( "loudong_type_rate","楼栋类型覆盖率");
map.put( "floor_type_reate","建筑类型(按楼层)覆盖率");
map.put( "archiNature_rate","建筑性质覆盖率");
map.put( "totalAreas_rate","建筑总面积覆盖率");
return map;
}
public Object houseAction(DataModel model) {
if (StringUtils.isBlank(model.getCityDisplay())) {
@@ -1200,6 +1200,37 @@ public class DistrictController {
model.setJsonModel(data);
return model;
}
/**
* 校验小区名是否为其他小区的别名
*/
public Object checkDistrictNameAction(@Param(name = "city") String city, @Param(name = "region") String region,
@Param(name = "name") String name, @Param(name = "cat") String cat, @Param(name = "id") String id) {
JsonModel model = new JsonModel();
boolean exist = false;
List list = new ArrayList<String>();
list.add(name);
List<QueryParam> params = new ArrayList<QueryParam>();
params.add(new QueryParam("category", cat));
params.add(new QueryParam("city", city));
params.add(new QueryParam("region", region));
params.add(new QueryParam("alias", name));
params.add(new QueryParam("visible", 0));
List<District> ds = districtService.findAllByParams(params);
if (CollectionUtils.isNotEmpty(ds)) {
for (District d : ds) {
if (!d.getId().equals(id)) {
exist = true;
break;
}
}
}
Map<String, Object> data = new HashMap<String, Object>();
data.put("exist", exist);
model.setJsonModel(data);
return model;
}
/**
* 保存新增小区
@@ -2320,6 +2351,7 @@ public class DistrictController {
params = new ArrayList<QueryParam>(2);
params.add(new QueryParam("category", "district,new_district"));
params.add(new QueryParam("name", a));
params.add(new QueryParam("visible", 0));
ds = districtService.findAllByParams(params);
@@ -196,49 +196,55 @@
<tr>
<td>等级</td>
<td class="v"><#if officeDetail.bedKind??>${officeDetail.bedKind * 100}%<#else>未知</#if></td>
<td>建筑类型</td>
<#--<td>建筑类型</td>
<td class="v"><#if officeDetail.buildType??>${officeDetail.buildType * 100}%<#else>未知</#if></td>
-->
<td>经纬度-mapabc</td>
<td class="v"><#if officeDetail.latLng??>${officeDetail.latLng * 100}%<#else>未知</#if></td>
<td>经纬度-百度</td>
<td class="v"><#if officeDetail.latLng2??>${officeDetail.latLng2 * 100}%<#else>未知</#if></td>
<td>开发商</td>
<td class="v"><#if officeDetail.developer??>${officeDetail.developer * 100}%<#else>未知</#if></td>
</tr>
<tr>
<td>建筑面积</td>
<td class="v"><#if officeDetail.buildArea??>${officeDetail.buildArea * 100}%<#else>未知</#if></td>
<td>占地面积</td>
<td class="v"><#if officeDetail.allArea??>${officeDetail.allArea * 100}%<#else>未知</#if></td>
<td>入住时间</td>
<#--<td>入住时间</td>
<td class="v"><#if officeDetail.liveDate??>${officeDetail.liveDate * 100}%<#else>未知</#if></td>
<td>外景图</td>
<td class="v"><#if officeDetail.outPics??>${officeDetail.outPics * 100}%<#else>未知</#if></td>
-->
<td>容积率</td>
<td class="v"><#if officeDetail.cubagePercent??>${officeDetail.cubagePercent * 100}%<#else>未知</#if></td>
<td>绿化率</td>
<td class="v"><#if officeDetail.virescencePercent??>${officeDetail.virescencePercent * 100}%<#else>未知</#if></td>
</tr>
<tr>
<td>开发商</td>
<td class="v"><#if officeDetail.developer??>${officeDetail.developer * 100}%<#else>未知</#if></td>
<td>物业公司</td>
<td class="v"><#if officeDetail.estateCompany??>${officeDetail.estateCompany * 100}%<#else>未知</#if></td>
<td>容积率</td>
<td class="v"><#if officeDetail.cubagePercent??>${officeDetail.cubagePercent * 100}%<#else>未知</#if></td>
<td>绿化率</td>
<td class="v"><#if officeDetail.virescencePercent??>${officeDetail.virescencePercent * 100}%<#else>未知</#if></td>
<td>物业费</td>
<td class="v"><#if officeDetail.estateCharge??>${officeDetail.estateCharge * 100}%<#else>未知</#if></td>
<td>&nbsp;</td>
<td class="v">&nbsp;</td>
<td>&nbsp;</td>
<td class="v">&nbsp;</td>
</tr>
<tr>
<td>物业费</td>
<td class="v"><#if officeDetail.estateCharge??>${officeDetail.estateCharge * 100}%<#else>未知</#if></td>
<td>物业类型</td>
<#--<td>物业类型</td>
<td class="v"><#if officeDetail.estateType2??>${officeDetail.estateType2 * 100}%<#else>未知</#if></td>
<td>周边配套</td>
<td class="v"><#if officeDetail.facilities??>${officeDetail.facilities * 100}%<#else>未知</#if></td>
<td>项目特色</td>
<td class="v"><#if officeDetail.characteristic??>${officeDetail.characteristic * 100}%<#else>未知</#if></td>
-->
</tr>
<tr>
<td>均价</td>
<#--<td>均价</td>
<td class="v"><#if officeDetail.price??>${officeDetail.price * 100}%<#else>未知</#if></td>
<td>租金</td>
<td class="v"><#if officeDetail.rentPrice??>${officeDetail.rentPrice * 100}%<#else>未知</#if></td>
@@ -246,6 +252,7 @@
<td class="v">&nbsp;</td>
<td>&nbsp;</td>
<td class="v">&nbsp;</td>
-->
</tr>
</table>
@@ -851,20 +851,20 @@ function add(){
}
}
var mappingAlias = $("#mappingAlias").val();
if(mappingAlias){
var aliasArr=alias.toString().split("\n");
var set=[];
for(var i=0;i<aliasArr.length;i++){
var aliasName=aliasArr[i].trim();
if(aliasName && aliasName!=''){
if(aliasName==name){
alert('小区名和别名不能相同!');
return false;
var mappingAlias = $("#mappingAlias").val();
if(mappingAlias){
var aliasArr=alias.toString().split("\n");
var set=[];
for(var i=0;i<aliasArr.length;i++){
var aliasName=aliasArr[i].trim();
if(aliasName && aliasName!=''){
if(aliasName==name){
alert('小区名和别名不能相同!');
return false;
}
}
}
}
}
var region = $("#region").val();
if (region == '') {
@@ -902,15 +902,35 @@ function add(){
timeout: 100000,
success: function(model) {
if(model.exist){
alert("小区名已存在")
return false;
alert("小区名已存在");
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
jQuery.ajax({
type: 'POST',
async: false,
url: '../district/checkDistrictName',
data: {city:city,region:region,name:name,cat:"district"},
dataType: 'json',
timeout: 100000,
success: function(model) {
if(model.exist){
alert("小区名是其他小区的别名");
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
@@ -930,13 +950,15 @@ function add(){
success: function(model) {
if (model.msg) {
alert('别名中 "' + model.msg + '" 已经是其他小区的小区名,不能作为别名使用!');
return false;
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
var flag = $("#goPic").val()
if(flag=="true"){
$("#lineForm").submit();
@@ -956,7 +978,7 @@ function add(){
});
}
}
@@ -21,7 +21,7 @@
<div id = "save">
<#assign markMap = district.markMap! />
<form id="lineForm" action="../district/save" method = "post">
<input type="hidden" name="district.id" value="${district.id}" />
<input type="hidden" id = "districtId" name="district.id" value="${district.id}" />
<input type="hidden" name="district.category" value="${district.category}" />
<input type="hidden" name="cityDisplay" value="${cityDisplay!}" />
<input type="hidden" name="keyword" value="${keyword!}" />
@@ -1130,20 +1130,18 @@ $(document).ready(function(){
alert('区域不能为空!');
return false;
}
/*
var dLat = $("#dLat").val();
if (dLat == '') {
alert('经纬度不能为空!');
return false;
}
var dLng = $("#dLng").val();
if (dLng == '') {
alert('经纬度不能为空!');
return false;
}
*/
var name = $("#districtName").val();
if (name == '') {
@@ -1183,14 +1181,56 @@ $(document).ready(function(){
}
}
/*
var address = $("#address").val();
if (address == '') {
alert('小区地址不能为空!');
return false;
}
*/
var id = $("#districtId").val();
var flg = false;
jQuery.ajax({
type: 'POST',
async: false,
url: '../district/validateDistrictName',
data: {city:city,region:region,name:name,cat:"district", id:id},
dataType: 'json',
timeout: 100000,
success: function(model) {
if(model.exist){
alert("小区名已存在");
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
jQuery.ajax({
type: 'POST',
async: false,
url: '../district/checkDistrictName',
data: {city:city,region:region,name:name,cat:"district",id:id},
dataType: 'json',
timeout: 100000,
success: function(model) {
if(model.exist){
alert("小区名是其他小区的别名");
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
jQuery.ajax({
type: 'POST',
@@ -1202,15 +1242,15 @@ $(document).ready(function(){
success: function(model) {
if (model.msg) {
alert('别名中 "' + model.msg + '" 已经是其他小区的小区名,不能作为别名使用!');
return false;
} else {
return true;
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
return true;
});
@@ -121,28 +121,30 @@
<option value="标准写字楼">标准写字楼</option>
<option value="创意园区">创意园区</option>
<option value="商住两用">商住两用</option>
<option value="综合体">综合体</option>
<option value="其他">其他</option>
</select>
</td>
</tr>
<tr>
<td class = "bg" style="color:red;font-size:15px;">建筑类型</td>
<td>
<input type="hidden" id="build_type" name="district.buildType"/>
<div id="standardOffice">
<input type="checkbox" name="build_type_t" value="纯写字楼">纯写字楼&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商务中心">商务中心&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="酒店写字楼">酒店写字楼&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商住楼">商住楼&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商务综合体">商务综合体&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商业综合体">商业综合体&nbsp;&nbsp;
</div>
<div id="garden">
<input type="checkbox" name="build_type_t" value="创意园区" >创意园区&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="创意产业园区" >创意产业园区&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="独栋写字楼">独栋写字楼&nbsp;&nbsp;
</div>
</td>
</tr>
<#-- <tr>-->
<#-- <td class = "bg" style="color:red;font-size:15px;">建筑类型</td>-->
<#-- <td>-->
<#-- <input type="hidden" id="build_type" name="district.buildType"/>-->
<#-- <div id="standardOffice">-->
<#-- <input type="checkbox" name="build_type_t" value="纯写字楼">纯写字楼&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商务中心">商务中心&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="酒店写字楼">酒店写字楼&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商住楼">商住楼&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商务综合体">商务综合体&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商业综合体">商业综合体&nbsp;&nbsp;-->
<#-- </div>-->
<#-- <div id="garden">-->
<#-- <input type="checkbox" name="build_type_t" value="创意园区" >创意园区&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="创意产业园区" >创意产业园区&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="独栋写字楼">独栋写字楼&nbsp;&nbsp;-->
<#-- </div>-->
<#-- </td>-->
<#-- </tr>-->
<tr id="tr_block">
<td class = "t1">板块</td>
<td>
@@ -150,12 +152,12 @@
</select>
</td>
</tr>
<tr>
<td class="bg">商圈</td>
<td>
<input name="district.businessQuarter" type="text" style="width:300px" value="" />
</td>
</tr>
<#-- <tr>-->
<#-- <td class="bg">商圈</td>-->
<#-- <td>-->
<#-- <input name="district.businessQuarter" type="text" style="width:300px" value="" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class="bg">乡镇街道</td>
<td>
@@ -285,12 +287,12 @@
<input name="district.carSiteCount" type="text" style="width:300px" value="" onkeydown="return justPositiveInteger(this,event);"/>个
</td>
</tr>
<tr>
<td class="t1">车位描述</td>
<td>
<input name="district.carSite" type="text" style="width:300px" value="" />
</td>
</tr>
<#-- <tr>-->
<#-- <td class="t1">车位描述</td>-->
<#-- <td>-->
<#-- <input name="district.carSite" type="text" style="width:300px" value="" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class="t1">地上车位数</td>
@@ -335,12 +337,12 @@
<input name="istrict.propertyLife" type="text" style="width:300px" value="" />
</td>
</tr>
<tr>
<td class="bg">楼层情况</td>
<td>
<input name="district.floorInfo" type="text" style="width:300px" value="" onkeydown="return justPositiveInteger(this,event);"/>
</td>
</tr>
<#-- <tr>-->
<#-- <td class="bg">楼层情况</td>-->
<#-- <td>-->
<#-- <input name="district.floorInfo" type="text" style="width:300px" value="" onkeydown="return justPositiveInteger(this,event);"/>-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class="bg">净高</td>
<td>
@@ -456,12 +458,12 @@
<#-- </tr>-->
<tr>
<td class="t1">开盘时间</td>
<td>
<input name="district.openDate" type="text" style="width:300px" value="" />
</td>
</tr>
<#-- <tr>-->
<#-- <td class="t1">开盘时间</td>-->
<#-- <td>-->
<#-- <input name="district.openDate" type="text" style="width:300px" value="" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class="bg">竣工时间</td>
<td>
@@ -203,36 +203,38 @@
<option value="标准写字楼" <#if district.estateType2?? && district.estateType2=="标准写字楼">selected</#if>>标准写字楼</option>
<option value="创意园区" <#if district.estateType2?? && district.estateType2=="创意园区">selected</#if>>创意园区</option>
<option value="商住两用" <#if district.estateType2?? && district.estateType2=="商住两用">selected</#if>>商住两用</option>
<option value="综合体" <#if district.estateType2?? && district.estateType2=="综合体">selected</#if>>综合体</option>
<option value="其他" <#if district.estateType2?? && district.estateType2=="其他">selected</#if>>其他</option>
</select>
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["build_type"]?? && markMap["build_type"] == 1>
<i class="lock" name="build_type"></i>
<#else>
<i class="unlock" name="build_type"></i>
</#if>
<span style="color:red;font-size:15px;">建筑类型</span></td>
<td>
<input type="hidden" id="build_type" name="district.buildType" value="${district.buildType!}"/>
<div id="standardOffice" style="<#if district.estateType2?? && (district.estateType2=='园区')>display:none;</#if>" >
<input type="checkbox" name="build_type_t" value="纯写字楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("纯写字楼")>checked</#if> >纯写字楼&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商务中心" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商务中心")>checked</#if>>商务中心&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="酒店写字楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("酒店写字楼")>checked</#if>>酒店写字楼&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商住楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商住楼")>checked</#if>>商住楼&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商务综合体" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商务综合体")>checked</#if>>商务综合体&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商业综合体" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商业综合体")>checked</#if>>商业综合体&nbsp;&nbsp;
</div>
<div id="garden" style="<#if district.estateType2?? && (district.estateType2=='标准写字楼')>display:none;</#if>">
<input type="checkbox" name="build_type_t" value="创意园区" <#if district.buildType?? && district.estateType2?? && district.estateType2=='园区'&& district.buildType?contains("创意园区")>checked</#if>>创意园区&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="创意产业园区" <#if district.buildType?? && district.estateType2?? && district.estateType2=='园区'&& district.buildType?contains("创意产业园区")>checked</#if>>创意产业园区&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="独栋写字楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='园区'&& district.buildType?contains("独栋写字楼")>checked</#if>>独栋写字楼&nbsp;&nbsp;
</div>
<div id="businessCenter" style="<#if district.estateType2?? && (district.estateType2=='商务中心')>display:none;</#if>">
</div>
</td>
</tr>
<#-- <tr>-->
<#-- <td class = "t1">-->
<#-- <#if markMap?? && markMap["build_type"]?? && markMap["build_type"] == 1>-->
<#-- <i class="lock" name="build_type"></i>-->
<#-- <#else>-->
<#-- <i class="unlock" name="build_type"></i>-->
<#-- </#if>-->
<#-- <span style="color:red;font-size:15px;">建筑类型</span></td>-->
<#-- <td>-->
<#-- <input type="hidden" id="build_type" name="district.buildType" value="${district.buildType!}"/>-->
<#-- <div id="standardOffice" style="<#if district.estateType2?? && (district.estateType2=='园区')>display:none;</#if>" >-->
<#-- <input type="checkbox" name="build_type_t" value="纯写字楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("纯写字楼")>checked</#if> >纯写字楼&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商务中心" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商务中心")>checked</#if>>商务中心&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="酒店写字楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("酒店写字楼")>checked</#if>>酒店写字楼&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商住楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商住楼")>checked</#if>>商住楼&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商务综合体" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商务综合体")>checked</#if>>商务综合体&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商业综合体" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商业综合体")>checked</#if>>商业综合体&nbsp;&nbsp;-->
<#-- </div>-->
<#-- <div id="garden" style="<#if district.estateType2?? && (district.estateType2=='标准写字楼')>display:none;</#if>">-->
<#-- <input type="checkbox" name="build_type_t" value="创意园区" <#if district.buildType?? && district.estateType2?? && district.estateType2=='园区'&& district.buildType?contains("创意园区")>checked</#if>>创意园区&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="创意产业园区" <#if district.buildType?? && district.estateType2?? && district.estateType2=='园区'&& district.buildType?contains("创意产业园区")>checked</#if>>创意产业园区&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="独栋写字楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='园区'&& district.buildType?contains("独栋写字楼")>checked</#if>>独栋写字楼&nbsp;&nbsp;-->
<#-- </div>-->
<#-- <div id="businessCenter" style="<#if district.estateType2?? && (district.estateType2=='商务中心')>display:none;</#if>">-->
<#-- </div>-->
<#-- </td>-->
<#-- </tr>-->
<tr id="tr_block">
<td class = "t1">
<#if markMap?? && markMap["block"]?? && markMap["block"] == 1>
@@ -245,21 +247,21 @@
<input id="block" name="district.block" style="width:300px" value="${district.block!}"/>
</td>
</tr>
<#-- <tr>-->
<#-- <td class = "t1">-->
<#-- <#if markMap?? && markMap["business_quarter"]?? && markMap["business_quarter"] == 1>-->
<#-- <i class="lock" name="business_quarter"></i>-->
<#-- <#else>-->
<#-- <i class="unlock" name="business_quarter"></i>-->
<#-- </#if>-->
<#-- 商圈</td>-->
<#-- <td>-->
<#-- <input name="district.businessQuarter" type="text" style="width:300px" value="${district.businessQuarter!}" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class = "t1">
<#if markMap?? && markMap["business_quarter"]?? && markMap["business_quarter"] == 1>
<i class="lock" name="business_quarter"></i>
<#else>
<i class="unlock" name="business_quarter"></i>
</#if>
商圈</td>
<td>
<input name="district.businessQuarter" type="text" style="width:300px" value="${district.businessQuarter!}" />
</td>
</tr>
<tr>
<td class="t1">
<#if markMap?? && markMap["township"]?? && markMap["township"]?is_number && markMap["township"] == 1>
<#if markMap?? && markMap["township"]?? && markMap["township"] == 1>
<i class="lock" name="township"></i>
<#else>
<i class="unlock" name="township"></i>
@@ -269,7 +271,6 @@
<input name="district.township" type="text" style="width:300px" value="${district.township!}" />
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["loop_line_info"]?? && markMap["loop_line_info"] == 1>
@@ -490,7 +491,7 @@
<#if markMap?? && markMap["estate_charge"]?? && markMap["estate_charge"] == 1>
<i class="lock" name="estate_charge"></i>
<#else>
<i class="unlock" name="estate_charge"></i>
<i class="unlock" name="得房率"></i>
</#if>
物 业 费</td>
<td>
@@ -510,19 +511,19 @@
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["car_site"]?? && markMap["car_site"] == 1>
<i class="lock" name="car_site"></i>
<#else>
<i class="unlock" name="car_site"></i>
</#if>
车位描述
</td>
<td>
<input name="district.carSite" type="text" style="width:300px" value="${district.carSite!}" />
</td>
</tr>
<#-- <tr>-->
<#-- <td class = "t1">-->
<#-- <#if markMap?? && markMap["car_site"]?? && markMap["car_site"] == 1>-->
<#-- <i class="lock" name="car_site"></i>-->
<#-- <#else>-->
<#-- <i class="unlock" name="car_site"></i>-->
<#-- </#if>-->
<#-- 车位描述-->
<#-- </td>-->
<#-- <td>-->
<#-- <input name="district.carSite" type="text" style="width:300px" value="${district.carSite!}" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class = "t1">
<#if markMap?? && markMap["land_car_site"]?? && markMap["land_car_site"] == 1>
@@ -618,18 +619,18 @@
<input name="district.propertyLife" type="text" style="width:300px" value="${district.propertyLife!}" />
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["floor_info"]?? && markMap["floor_info"] == 1>
<i class="lock" name="floor_info"></i>
<#else>
<i class="unlock" name="floor_info"></i>
</#if>
楼层情况</td>
<td>
<input name="district.floorInfo" type="text" style="width:300px" value="${district.floorInfo!}" />
</td>
</tr>
<#-- <tr>-->
<#-- <td class = "t1">-->
<#-- <#if markMap?? && markMap["floor_info"]?? && markMap["floor_info"] == 1>-->
<#-- <i class="lock" name="floor_info"></i>-->
<#-- <#else>-->
<#-- <i class="unlock" name="floor_info"></i>-->
<#-- </#if>-->
<#-- 楼层情况</td>-->
<#-- <td>-->
<#-- <input name="district.floorInfo" type="text" style="width:300px" value="${district.floorInfo!}" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class = "t1">
<#if markMap?? && markMap["clear_height"]?? && markMap["clear_height"] == 1>
@@ -861,18 +862,18 @@
<#-- <textarea alias="richarea" name="district.fitment" style="width:400px;height:100px;">${district.fitment!}</textarea>-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class = "t1">
<#if markMap?? && markMap["open_date"]?? && markMap["open_date"] == 1>
<i class="lock" name="open_date"></i>
<#else>
<i class="unlock" name="open_date"></i>
</#if>
开盘时间</td>
<td>
<input name="district.openDate" type="text" style="width:300px" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd'})" value="${t_util.formatDate(district.openDate!)}" />
</td>
</tr>
<#-- <tr>-->
<#-- <td class = "t1">-->
<#-- <#if markMap?? && markMap["open_date"]?? && markMap["open_date"] == 1>-->
<#-- <i class="lock" name="open_date"></i>-->
<#-- <#else>-->
<#-- <i class="unlock" name="open_date"></i>-->
<#-- </#if>-->
<#-- 开盘时间</td>-->
<#-- <td>-->
<#-- <input name="district.openDate" type="text" style="width:300px" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd'})" value="${t_util.formatDate(district.openDate!)}" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class = "t1">
<#if markMap?? && markMap["finish_building_date"]?? && markMap["finish_building_date"] == 1>
@@ -42,20 +42,23 @@
<#include "officeHeader.ftl"/>
<div>
<form action="../district2/officelist" id="_search_house_form">
城市:
<@d_city defaultValue="${cityDisplay!}" callback="changeCity" callbackField="display" name="cityDisplay" showCountry = "1" />
区域:
<select id="region" name="region" style="width: 80px;">
<option value="">不限</option>
<#list regionList! as r>
<option value="${r!}"<#if region! == r> selected</#if>>${r!}</option>
</#list>
</select>
类型:
类型:
<select name="estateType2" id="estateType2">
<option value="">不限</option>
<option value="标准写字楼" <#if estateType2?? & estateType2 == '标准写字楼'!>selected</#if>>标准写字楼</option>
<option value="创意园区" <#if estateType2?? & estateType2 == '创意园区'!>selected</#if>>创意园区</option>
<option value="商住两用" <#if estateType2?? & estateType2 == '商住两用'!>selected</#if>>商住两用</option>
<option value="综合体" <#if estateType2?? & estateType2 == '综合体'!>selected</#if>>综合体</option>
<option value="其他" <#if estateType2?? & estateType2 == '其他'!>selected</#if>>其他</option>
</select>
<input type="text" name="keyword" value="${keyword!}" placeholder="输入关键词搜索" />
@@ -345,6 +348,8 @@
<option value="标准写字楼" <#if district.estateType2?? && district.estateType2=='标准写字楼'>selected</#if>>标准写字楼</option>
<option value="创意园区" <#if district.estateType2?? && district.estateType2=='创意园区'>selected</#if>>创意园区</option>
<option value="商住两用" <#if district.estateType2?? && district.estateType2=='商住两用'>selected</#if>>商住两用</option>
<option value="综合体" <#if district.estateType2?? && district.estateType2=='综合体'>selected</#if>>综合体</option>
<option value="其他" <#if district.estateType2?? && district.estateType2=='其他'>selected</#if>>其他</option>
</select>
</td>
<td align="center" name="col19a" class="<#if columnIds?index_of('col19a')==-1>dn</#if>">