From 7bbbc8496180104fadba3844eb9d5125b19f7460 Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Tue, 25 Jul 2023 11:21:41 +0800 Subject: [PATCH 1/2] =?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 @@