diff --git a/deliverables/auto/pom.xml b/deliverables/auto/pom.xml index 292ddf9d6..831bfe4c9 100644 --- a/deliverables/auto/pom.xml +++ b/deliverables/auto/pom.xml @@ -18,6 +18,6 @@ goojia-auto - ../../projects/goojia-auto + 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 7879767cc..db5bf7e45 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 @@ -1920,6 +1920,7 @@ public class DistrictController { district.setMappingAlias(null); } } + district.setModificationDate(new Date()); districtService.save(district); } @@ -1981,6 +1982,7 @@ public class DistrictController { district.setLandProperty(model.getLandProperty()); } + district.setModificationDate(new Date()); districtService.save(district); } return model; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java index f640377a3..22c68e4cb 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java @@ -459,6 +459,11 @@ public class BaseAvgImportServlet extends HttpServlet { price.setCat("district"); price.setModifyDate(new Date()); guidingPriceService.save(price); + + Map udata = new HashMap(); + udata.put("modificationDate", new Date()); + districtService.updateById(udata, dis.getId()); + HttpRequest request = new HttpRequest(); HashMap params = new HashMap(); params.put("category", "sell"); diff --git a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl index 49bdc8ace..d9829bb53 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl @@ -835,7 +835,20 @@ function add(){ alert('å°�区å��ä¸�能为空ï¼�'); return false; } - + var estateType = $("#estateType2").val() + if(name.indexOf("商ä½�")>-1){ + if(estateType!="商ä½�"){ + alert('物业类型有误ï¼�'); + return false; + } + }else{ + if(name.indexOf("别墅")>-1){ + if(estateType!="别墅"){ + alert('物业类型有误ï¼�'); + return false; + } + } + } var alias=$("#alias").val(); if(alias){ var aliasArr=alias.toString().split("\n"); diff --git a/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl index 4a390beaf..9b29ea9e6 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl @@ -1148,6 +1148,20 @@ $(document).ready(function(){ alert('å°�区å��ä¸�能为空ï¼�'); return false; } + + if(name.indexOf("商ä½�")>-1){ + if(estateTypeStr!="商ä½�"){ + alert('物业类型有误ï¼�'); + return false; + } + }else{ + if(name.indexOf("别墅")>-1){ + if(estateTypeStr!="别墅"){ + alert('物业类型有误ï¼�'); + return false; + } + } + } var alias=$("#alias").val(); diff --git a/projects/fangjia-bkoff/src/main/webapp/style/address/main.css.baiduyun.uploading.cfg b/projects/fangjia-bkoff/src/main/webapp/style/address/main.css.baiduyun.uploading.cfg new file mode 100644 index 000000000..74aacef5a Binary files /dev/null and b/projects/fangjia-bkoff/src/main/webapp/style/address/main.css.baiduyun.uploading.cfg differ diff --git a/projects/fangjia-bkoff/src/main/webapp/style/audit/list.css.baiduyun.uploading.cfg b/projects/fangjia-bkoff/src/main/webapp/style/audit/list.css.baiduyun.uploading.cfg new file mode 100644 index 000000000..f612f71b5 Binary files /dev/null and b/projects/fangjia-bkoff/src/main/webapp/style/audit/list.css.baiduyun.uploading.cfg differ diff --git a/projects/fangjia-bkoff/src/main/webapp/style/theme.css.baiduyun.uploading.cfg b/projects/fangjia-bkoff/src/main/webapp/style/theme.css.baiduyun.uploading.cfg new file mode 100644 index 000000000..0c2959a18 Binary files /dev/null and b/projects/fangjia-bkoff/src/main/webapp/style/theme.css.baiduyun.uploading.cfg differ diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java index 81420c56c..c17210062 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java @@ -69,6 +69,7 @@ public class DataUtil { private static final String hanziReg = "[\\u4e00-\\u9fa5]"; private static final String englishReg = "[A-Za-z]"; + public static String[] TAGS =new String[]{"¶À¶°", "ÁªÅÅ", "µþ¼Ó", "˫ƴ", "»¨Ô°Ãæ»ý", "Ó¾³Ø", "±ðÊû", "´ø»¨Ô°", "Ñó·¿", "µþÆ´", "¶ÀÔº", "ÁªÌå", "΢Êû", "´óƽÊû"}; public static String replaceAll(String original, String with, Pattern... pattern) { if (StringUtils.isNotBlank(original)) { @@ -1463,6 +1464,13 @@ public class DataUtil { return false; } + public static boolean isNumber(String s) { + if (s != null && !"".equals(s.trim())) + return s.matches("^[0-9]*$"); + else + return false; + } + public static double roundDouble(double d, int scale) { try { double ret = new BigDecimal(String.valueOf(d)).setScale(scale, BigDecimal.ROUND_HALF_UP).doubleValue(); @@ -1834,6 +1842,44 @@ public class DataUtil { return false; } + /** + * ÊÇ·ñÊDZðÊû + * @return + */ + public static boolean isVilla(Double area, String name, Integer height, Integer room) { + if (area == null) { + return false; + } + if (area >= 150 && StringUtils.indexOfAny(name, TAGS) > -1) { + return true; + } + + boolean ret = false; + if (height != null && room != null) { + if (height <= 3) { + if (area > 200 && room >= 5) { + ret = true; + } + } + }else if(height != null){ + if (height <= 3) { + if (area > 200){ + ret = true; + } + } + } else if (height == null && room != null) { + if (area > 360 && room >= 6) { + ret = true; + } + } else if (height == null && room == null) { + if (area > 500) { + ret = true; + } + } + + return ret; + } + diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java index 52c181ac4..12cbcc5f6 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java @@ -165,6 +165,7 @@ public class SaleLeadsController { } + saleLeads = converValue(saleLeads); String body = "ÒµÎñÐèÇó£º" + saleLeads.getBusiness() + " " + saleLeads.getOtherBusiness() + "\n\n" @@ -363,11 +364,14 @@ public class SaleLeadsController { if (saleLeads.getId()!=null) { saleLeads.setId(null); } + + String ip = AnalyticsUtil.getIpAddress(req); saleLeads = converValue(saleLeads); String body = "ÒµÎñÐèÇó£º" + saleLeads.getBusiness() + "\n\n" + "ÐÕÃû£º" + saleLeads.getUname() + "\n\n" + "ÊÖ»ú£º" + saleLeads.getMobile() + "\n\n" + + "IP£º"+ip + "\n\n" + "×ÉѯÄÚÈÝ£º" + saleLeads.getRemarks()+ "\n\n" ; body = body.replaceAll("null", "").replaceAll("ÆäËû£¬ÇëÌîд", ""); if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { diff --git a/projects/fangjia-coresite/src/main/webapp/index.ftl b/projects/fangjia-coresite/src/main/webapp/index.ftl index 0856b496a..1fedc342d 100644 --- a/projects/fangjia-coresite/src/main/webapp/index.ftl +++ b/projects/fangjia-coresite/src/main/webapp/index.ftl @@ -99,6 +99,27 @@ @media(max-device-width:320px){ .searchBoxIndex{top:13.5rem;} } + .advert { + position: fixed; + top: 30%; + left: 40%; + right: 0; + height: 320px; + width: 580px; + z-index: 10000; + } + + .left-ad { + position: absolute; + bottom: 0; + left: 0; + width: 580px; + height: 300px; + background: url("${staticUrl}/images/fangjia/v5/adv.png"); + background-size: 100% 100%; + + } + .advert a{ float: right;margin-right: 10px;cursor: pointer;font-weight: bold;} @@ -108,6 +129,10 @@ <#include "/header/v5/_header.ftl"/> +<#----> +<#-- å…³é—--> +<#-- --> +<#----> @@ -556,7 +581,18 @@ $.config = {router: false}