diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationController.java index bf1bab30a..be342ece4 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/EvaluationController.java @@ -1246,7 +1246,7 @@ public class EvaluationController { //ûµÇ¼3´Î userId = CoresiteCookieContext.getInstance().getCookieValue(req, CookieName.UID); int count = evaluationService.getCountToday(userId); - if (count > 200) { + if (count > 2) { model.setPermissionEvaluation(false); model.setErrMsg("2"); return model; @@ -1254,7 +1254,7 @@ public class EvaluationController { }else{ //µÇ¼5´Î int count = evaluationService.getCountToday(userId); - if (count > 400) { + if (count > 4) { model.setPermissionEvaluation(false); model.setErrMsg("1"); return model; @@ -1301,14 +1301,14 @@ public class EvaluationController { String userId = LoginUtil.getUserId(req); //µÇ¼+ÿÌì¿ÉÆÀ¹À3´Î int count = evaluationService.getCountToday(userId); - if (count >= 300) { + if (count >= 3) { model.setPermissionEvaluation(false); model.setErrMsg("1"); return model; } //µÇ¼+ÿÔ¿ÉÆÀ¹À20´Î int count_ = evaluationService.getCountCurrentMonth(userId); - if (count_ >= 300) { + if (count_ >= 20) { model.setPermissionEvaluation(false); model.setErrMsg("2"); return model; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java index bc5a60732..6351025d3 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java @@ -53,6 +53,7 @@ import com.fangjia.service.datastore.HouseService; import com.fangjia.service.datastore.RegionStatService; import com.fangjia.service.datastore.bean.HousePicEnum; import com.fangjia.service.datastore.bean.HouseQueryBean; +import com.fangjia.service.datastore.EvaluationService; import com.fangjia.service.district.DistrictStatService; import com.fangjia.service.district.TradeStatService; import com.fangjia.service.fsh.DistrictNewPriceService; @@ -77,6 +78,7 @@ public class TrendController { private TradeStatService tradeStatService; private DistrictNewPriceService districtNewPriceService; private DistrictSellStatService districtSellStatService; + private EvaluationService evaluationService; private static int QUARTER_WEEK = 13; private final static Logger LOGGER = LoggerFactory.getLogger(TrendController.class); @@ -124,6 +126,23 @@ public class TrendController { } return model; } + /** + * ·¿²úÆÀ¹À´ÎÊý + * + * @param model + * @return + */ + public Object trendReportCountAction(TrendModel model,HttpServletRequest request) { + + JsonModel ret = new JsonModel(); + + Map data = new HashMap(); + data.put("evalCount", evaluationService.getTotalCount()); + + ret.setJsonModel(data); + + return ret; + } /** * ×ßÊÆͼ @@ -1260,7 +1279,9 @@ public class TrendController { DistrictSellStatService districtSellStatService) { this.districtSellStatService = districtSellStatService; } - - + + public void setEvaluationService(EvaluationService evaluationService) { + this.evaluationService = evaluationService; + } } diff --git a/projects/fangjia-coresite/src/main/webapp/company/about.ftl b/projects/fangjia-coresite/src/main/webapp/company/about.ftl index 98f28471f..3e72ea732 100644 --- a/projects/fangjia-coresite/src/main/webapp/company/about.ftl +++ b/projects/fangjia-coresite/src/main/webapp/company/about.ftl @@ -46,11 +46,11 @@
-

公司介绍

+

公司介绍

-
+
@@ -66,7 +66,7 @@
-

发展历程

+

发展历程

diff --git a/projects/fangjia-coresite/src/main/webapp/header/v6/_city_select.ftl b/projects/fangjia-coresite/src/main/webapp/header/v6/_city_select.ftl index 53d5a978b..591351832 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v6/_city_select.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v6/_city_select.ftl @@ -21,7 +21,7 @@ -