From 35a317ca4eb844798213415cfcc0bc8b6a8e6866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=A8=9F?= Date: Tue, 11 Oct 2022 21:10:02 +0800 Subject: [PATCH 1/3] Update HouseToCController.java --- .../java/com/fangjia/youda/controller/HouseToCController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-youda/fangjia-youda-web-customer/src/main/java/com/fangjia/youda/controller/HouseToCController.java b/projects/fangjia-youda/fangjia-youda-web-customer/src/main/java/com/fangjia/youda/controller/HouseToCController.java index 1aacf834b..3238d95f8 100644 --- a/projects/fangjia-youda/fangjia-youda-web-customer/src/main/java/com/fangjia/youda/controller/HouseToCController.java +++ b/projects/fangjia-youda/fangjia-youda-web-customer/src/main/java/com/fangjia/youda/controller/HouseToCController.java @@ -309,7 +309,7 @@ public class HouseToCController { params.put("token", token); params.put("size", query.getArea()); params.put("app", "youda");// openä¿�存估价记录 - params.put("youDa", true); + //params.put("youDa", true); if (houseInfo.getFloor() != 0 && houseInfo.getHeight() != 0) { params.put("floor", houseInfo.getFloor()); params.put("maxFloor", houseInfo.getHeight()); @@ -601,7 +601,7 @@ public class HouseToCController { params.put("name", name); params.put("type", type * (-1)); params.put("evalDate", DateUtils.date2Str(houseInfo.getEvalTime())); - params.put("youDa", true); + //params.put("youDa", true); DistrictEvaluateSingleDto result = openApiProxyService.getProxyService(FshApiRemoteService.class) .getFshDistPriceTrends(params); From 0cf86d57b891262dbd065e497e945344b52bf275 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 11 Oct 2022 21:25:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E5=8F=8B=E8=BE=BE=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/FshController.java | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FshController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FshController.java index 40a303f11..d5d69a1af 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FshController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/FshController.java @@ -386,24 +386,24 @@ public class FshController { Double oneMonthMarkup = null; Evaluation evaluation = null; if(model.isYouDa()){ - if("ÉϺ£".equals(model.getCity())){ - YdDealPrice ydDealPrice = ydDealPriceService.findYdDealPrice(model.getCity(), model.getDistrict(), model.getName()); - if(ydDealPrice == null){ - mav.setModel(BasicModel.buildOKModel().setMsg("¸ÃÐ¡ÇøÔݲ»Ö§³Ö¹À¼Û").markNoData()); - return mav; - }else{ - evaluation = evaluationService.ydEvaluate(district, buildYdEvaluation(model, request), model.getCalDate(),ydDealPrice.getPrice()); - //½ü30ÌìµÄÕǵø·ù£ºÈ¡×î½ü1¸öÔÂÖÁ3¸öÔÂÖ®¼ä×î½üµÄÄÇÆÚ¼Û¸ñºÍµ±Ç°¾ù¼ÛÏà±È - Date end = DateUtil.getDateOfLastMonth(new Date(),-1); - Date start = DateUtil.getDateOfLastMonth(new Date(),-3); - List ydDealPrices = ydDealPriceService.findYdDealPrices(model.getCity(), model.getDistrict(), model.getName(),start,end); - if(ydDealPrices!=null && ydDealPrices.size()>0){ - oneMonthMarkup = (double)(ydDealPrices.get(0).getPrice()-ydDealPrice.getPrice())/ydDealPrice.getPrice(); - } - } - }else{ +// if("ÉϺ£".equals(model.getCity())){ +// YdDealPrice ydDealPrice = ydDealPriceService.findYdDealPrice(model.getCity(), model.getDistrict(), model.getName()); +// if(ydDealPrice == null){ +// mav.setModel(BasicModel.buildOKModel().setMsg("¸ÃÐ¡ÇøÔݲ»Ö§³Ö¹À¼Û").markNoData()); +// return mav; +// }else{ +// evaluation = evaluationService.ydEvaluate(district, buildYdEvaluation(model, request), model.getCalDate(),ydDealPrice.getPrice()); +// //½ü30ÌìµÄÕǵø·ù£ºÈ¡×î½ü1¸öÔÂÖÁ3¸öÔÂÖ®¼ä×î½üµÄÄÇÆÚ¼Û¸ñºÍµ±Ç°¾ù¼ÛÏà±È +// Date end = DateUtil.getDateOfLastMonth(new Date(),-1); +// Date start = DateUtil.getDateOfLastMonth(new Date(),-3); +// List ydDealPrices = ydDealPriceService.findYdDealPrices(model.getCity(), model.getDistrict(), model.getName(),start,end); +// if(ydDealPrices!=null && ydDealPrices.size()>0){ +// oneMonthMarkup = (double)(ydDealPrices.get(0).getPrice()-ydDealPrice.getPrice())/ydDealPrice.getPrice(); +// } +// } +// }else{ evaluation = evaluationService.evaluate(district, buildYdEvaluation(model, request), model.getCalDate()); - } +// } }else{ evaluation = evaluationService.evaluate(district, buildEvaluation(model, request), model.getCalDate()); } @@ -1163,18 +1163,18 @@ public class FshController { private Map buildDistrictAvgZouShiByMonth(DistrictModel model,DistrictKey districtKey, Date end, Date start) { Map> avgPriceDetailMap = new HashMap>(); - if(model.isYouDa() && "ÉϺ£".equals(model.getCityName())){ - List list = ydDealPriceService.findYdDealPrices(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), start, end); - for (YdDealPrice stat : list) { - String ws = DateUtil.formatByPattern(stat.getWeekend(), "yyyy-MM"); - List prices = avgPriceDetailMap.get(ws); - if(null == prices){ - prices = new ArrayList(); - avgPriceDetailMap.put(ws, prices); - } - prices.add(stat.getPrice()); - } - }else{ +// if(model.isYouDa() && "ÉϺ£".equals(model.getCityName())){ +// List list = ydDealPriceService.findYdDealPrices(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), start, end); +// for (YdDealPrice stat : list) { +// String ws = DateUtil.formatByPattern(stat.getWeekend(), "yyyy-MM"); +// List prices = avgPriceDetailMap.get(ws); +// if(null == prices){ +// prices = new ArrayList(); +// avgPriceDetailMap.put(ws, prices); +// } +// prices.add(stat.getPrice()); +// } +// }else{ List list = districtStatService.findDistrictPrice(districtKey.getCity(), districtKey.getRegion(), districtKey.getName(), start, end); for (DistrictStat stat : list) { String ws = DateUtil.formatByPattern(stat.getWeekend(), "yyyy-MM"); @@ -1185,7 +1185,7 @@ public class FshController { } prices.add(stat.getAvgPrice()); } - } +// } Map districtMap = new HashMap(); if(null != avgPriceDetailMap){ From 652acb7fa1a1d3cf0619009f96d5131e3694856f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=A8=9F?= Date: Wed, 12 Oct 2022 09:10:05 +0800 Subject: [PATCH 3/3] Update ExportDistrictRongHe.groovy --- .../script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy index 229ed763f..386f96f4b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy @@ -31,7 +31,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd") def new_dists = []//["350604","350605","410307","410308","450181"] //按天导(æ¯�天一个文件夹) -// exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-1), "yyyy-MM-dd"), new_dists) + exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-1), "yyyy-MM-dd"), new_dists) if(curDate.toString().endsWith("10")){ exportBigdataCommunityGJRH()//