From 73377ea5909886a92128e8c259733cb65067f0b5 Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Sat, 26 Aug 2023 11:56:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coresite/controllers/TrendController.java | 25 +- .../main/webapp/header/v6/_city_select.ftl | 2 +- .../src/main/webapp/solution/financial.ftl | 12 +- .../src/main/webapp/trend/trend.ftl | 404 ++++++++---------- .../webapp/style/fangjia/v6/_city_select.css | 14 +- .../webapp/style/fangjia/v6/financial.css | 32 +- .../main/webapp/style/fangjia/v6/trend.css | 28 +- 7 files changed, 251 insertions(+), 266 deletions(-) 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/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 @@ -