From 92fe6d0a43218436807dbdca0eff50b923ae6890 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 21 Jul 2023 11:50:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=98=B2=E7=BB=8F=E7=BA=AC=E5=BA=A6?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/weixin/WeiXinEvaluationController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java index 800a2360d..c89bc6f53 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java @@ -1282,7 +1282,10 @@ public class WeiXinEvaluationController { Point point = new Point(Double.valueOf(ll[0]), Double.valueOf(ll[1])); points.add(point); } - Point point = new Point(district.getLng2()/10000000000.0, district.getLat2()/10000000000.0); + Point point = null; + if(district.getLng2()!=null){ + point = new Point(district.getLng2()/10000000000.0, district.getLat2()/10000000000.0); + } //boolean flag = InsidePolygon.aboutZone(point, points); //boolean flag = InsidePolygon.isPtInPoly(point.getLon(), point.getLat(), points); boolean flag = InsidePolygon2.checkIsInPolygon(point, points); From d70506f4bdf1f62ce93d9c7c7df115b1ceb1fd8e Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 21 Jul 2023 18:15:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=BA=E7=A6=8F=E5=B7=9E=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkoff/controllers/AvgPriceUpdateController.java | 12 ++++++++++++ .../main/webapp/avgPriceUpdate/districtDetail.ftl | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AvgPriceUpdateController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AvgPriceUpdateController.java index 022176f79..9e99dd400 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AvgPriceUpdateController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AvgPriceUpdateController.java @@ -602,6 +602,18 @@ public class AvgPriceUpdateController { calcCommandService.save(cmds); json.put("msg", "任务保存成功,共保存" + cmds.size() + "条任务"); + + //均价修改,让小区也修改,为了福州可以识别被修改小区 + if(commands.size()>0){ + for (int i = 0, len = commands.size(); i < len; i++) { + JSONObject command = (JSONObject) commands.get(i); + if(command.containsKey("id")){ + Map udata = new HashMap(); + udata.put("modificationDate", new Date()); + districtService.updateById(udata, command.getString("id")); + } + } + } return model; } diff --git a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl index b173ee86a..2e55ef1c2 100644 --- a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl @@ -1016,7 +1016,7 @@ var type = $(this).attr('type'); var data ={}; var commands = Array(); - commands.push({city:'${district.city!}',region:'${district.region!}',name:'${district.name!}',estateType:'${district.estateType2!}'}) + commands.push({id:'${district.id!}',city:'${district.city!}',region:'${district.region!}',name:'${district.name!}',estateType:'${district.estateType2!}'}) data.commands = commands ; data.calcRange = type; $.ajax({ From 7bbbc8496180104fadba3844eb9d5125b19f7460 Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Tue, 25 Jul 2023 11:21:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=8E=E5=8F=B0=EF=BC=9A=E5=9D=87?= =?UTF-8?q?=E4=BB=B7=E7=AE=A1=E7=90=86=E2=80=9C=E6=A5=BC=E6=A0=8B=E7=B3=BB?= =?UTF-8?q?=E6=95=B0=E7=AE=A1=E7=90=86=E2=80=9D=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20https://zentao.fangjia.com/task-view-64.html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/BuildingRatioController.java | 8 ++++++ .../bkoff/model/BuildingRatioModel.java | 18 +++++++++++++ .../src/main/webapp/buildingRatio/add.ftl | 25 ++++++++++++++++++- .../src/main/webapp/buildingRatio/edit.ftl | 25 ++++++++++++++++++- .../src/main/webapp/buildingRatio/list.ftl | 18 ++++++++++--- .../dal/mongo/model/bkoff/BuildingRatio.java | 19 +++++++++++++- .../fangjia/service/bo/BuildingRatioBo.java | 18 +++++++++++++ 7 files changed, 125 insertions(+), 6 deletions(-) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java index afd4fb55c..159155d1c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java @@ -42,6 +42,8 @@ public class BuildingRatioController { buildingRatio.setM_date(date); buildingRatio.setCreate_user(model.getCreate_user()); buildingRatio.setNote(model.getNote()); + buildingRatio.setBuilding_avg_price(model.getBuilding_avg_price()); + buildingRatio.setAvg_price(model.getAvg_price()); this.buildingRatioService.save(buildingRatio); model.setMsg("新建成功!"); @@ -76,6 +78,8 @@ public class BuildingRatioController { data_buildingRatio.put("region", model.getRegion()); data_buildingRatio.put("district", model.getDistrict()); data_buildingRatio.put("building_name", model.getBuilding_name()); + data_buildingRatio.put("building_avg_price", model.getBuilding_avg_price()); + data_buildingRatio.put("avg_price", model.getAvg_price()); data_buildingRatio.put("ratio", model.getRatio()); data_buildingRatio.put("m_date", new Date()); data_buildingRatio.put("create_user", model.getCreate_user()); @@ -103,6 +107,8 @@ public class BuildingRatioController { bo.setRegion(buildingRatio.getRegion()); bo.setDistrict(buildingRatio.getDistrict()); bo.setBuilding_name(buildingRatio.getBuilding_name()); + bo.setBuilding_avg_price(buildingRatio.getBuilding_avg_price()); + bo.setAvg_price(buildingRatio.getAvg_price()); bo.setRatio(buildingRatio.getRatio()); bo.setC_date(buildingRatio.getC_date()); bo.setM_date(buildingRatio.getM_date()); @@ -135,6 +141,8 @@ public class BuildingRatioController { bo.setRegion(buildingRatio.getRegion()); bo.setDistrict(buildingRatio.getDistrict()); bo.setBuilding_name(buildingRatio.getBuilding_name()); + bo.setBuilding_avg_price(buildingRatio.getBuilding_avg_price()); + bo.setAvg_price(buildingRatio.getAvg_price()); bo.setRatio(buildingRatio.getRatio()); bo.setCreate_user(buildingRatio.getCreate_user()); bo.setNote(buildingRatio.getNote()); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BuildingRatioModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BuildingRatioModel.java index 7afdeb9db..3c916b169 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BuildingRatioModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/BuildingRatioModel.java @@ -17,6 +17,8 @@ public class BuildingRatioModel extends BaseModel{ private String region; private String district; private String building_name; + private String avg_price; + private String building_avg_price; private String create_user; private String note; private Double ratio; @@ -131,4 +133,20 @@ public class BuildingRatioModel extends BaseModel{ public void setNote(String note) { this.note = note; } + + public String getAvg_price() { + return avg_price; + } + + public void setAvg_price(String avg_price) { + this.avg_price = avg_price; + } + + public String getBuilding_avg_price() { + return building_avg_price; + } + + public void setBuilding_avg_price(String building_avg_price) { + this.building_avg_price = building_avg_price; + } } diff --git a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl index ca7565298..3631afd88 100644 --- a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl @@ -46,9 +46,19 @@ 妤兼爧鍚嶇О + + 妤兼爧鍧囦环 + + + + 灏忓尯鍧囦环 + + 妤兼爧绯绘暟 - + 鍒涘缓浜� @@ -66,6 +76,19 @@