Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj
This commit is contained in:
+12
@@ -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<String, Object> udata = new HashMap<String, Object>();
|
||||
udata.put("modificationDate", new Date());
|
||||
districtService.updateById(udata, command.getString("id"));
|
||||
}
|
||||
}
|
||||
}
|
||||
return model;
|
||||
}
|
||||
|
||||
|
||||
+8
@@ -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());
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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({
|
||||
|
||||
@@ -46,9 +46,19 @@
|
||||
<td>楼栋名称</td>
|
||||
<td><input name="building_name" value="${building_name!}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>楼栋均价</td>
|
||||
<td><input name="building_avg_price" oninput="getRatio()" value="${building_avg_price!}" onkeyup=
|
||||
"value=value.replace(/[^\d]/g,'')" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>小区均价</td>
|
||||
<td><input name="avg_price" oninput="getRatio()" value="${avg_price!}" onkeyup=
|
||||
"value=value.replace(/[^\d]/g,'')" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>楼栋系数</td>
|
||||
<td><input name="ratio" value="${ratio!}" /></td>
|
||||
<td><input id="ratio" name="ratio" value="${ratio!}" readonly="true"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>创建人</td>
|
||||
@@ -66,6 +76,19 @@
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
function getRatio() {
|
||||
var building_avg_price = $("input[name='building_avg_price']").val();
|
||||
var avg_price = $("input[name='avg_price']").val();
|
||||
if(typeof(building_avg_price) == "undefined" || building_avg_price == ""){
|
||||
return false;
|
||||
}
|
||||
if(typeof(avg_price) == "undefined" || avg_price == ""){
|
||||
return false;
|
||||
}
|
||||
var ratio = building_avg_price/avg_price;
|
||||
var num = new Number(ratio);
|
||||
$("#ratio").val(num.toFixed(2));
|
||||
}
|
||||
function submitForm(){
|
||||
var city_name = $("input[name='city_name']").val();
|
||||
var region = $("input[name='region']").val();
|
||||
|
||||
@@ -51,9 +51,19 @@
|
||||
<input name="id" value="${buildingRatioBo.id!}" type="hidden"/>
|
||||
<td><input name="building_name" value="${buildingRatioBo.building_name!}"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>楼栋均价</td>
|
||||
<td><input name="building_avg_price" oninput="getRatio()" value="${buildingRatioBo.building_avg_price!}" onkeyup=
|
||||
"value=value.replace(/[^\d]/g,'')" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>小区均价</td>
|
||||
<td><input name="avg_price" oninput="getRatio()" value="${buildingRatioBo.avg_price!}" onkeyup=
|
||||
"value=value.replace(/[^\d]/g,'')" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>楼栋系数</td>
|
||||
<td><input name="ratio" value="${buildingRatioBo.ratio!}" /></td>
|
||||
<td><input id="ratio" name="ratio" value="${buildingRatioBo.ratio!}" readonly="true"/></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>创建人</td>
|
||||
@@ -72,6 +82,19 @@
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
function getRatio() {
|
||||
var building_avg_price = $("input[name='building_avg_price']").val();
|
||||
var avg_price = $("input[name='avg_price']").val();
|
||||
if(typeof(building_avg_price) == "undefined" || building_avg_price == ""){
|
||||
return false;
|
||||
}
|
||||
if(typeof(avg_price) == "undefined" || avg_price == ""){
|
||||
return false;
|
||||
}
|
||||
var ratio = building_avg_price/avg_price;
|
||||
var num = new Number(ratio);
|
||||
$("#ratio").val(num.toFixed(2));
|
||||
}
|
||||
function submitForm() {
|
||||
var city_name = $("input[name='city_name']").val();
|
||||
var region = $("input[name='region']").val();
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
<th align="center" width="55px">
|
||||
ID
|
||||
</th>
|
||||
<th align="center" width="100px">
|
||||
<th align="center" width="50px">
|
||||
城市
|
||||
</th>
|
||||
<th align="center" width="60px">
|
||||
@@ -48,16 +48,22 @@
|
||||
<th align="center" width="60px">
|
||||
楼栋名称
|
||||
</th>
|
||||
<th align="center" width="60px">
|
||||
楼栋均价
|
||||
</th>
|
||||
<th align="center" width="60px">
|
||||
小区均价
|
||||
</th>
|
||||
<th align="center" width="60px">
|
||||
楼栋系数
|
||||
</th>
|
||||
<th align="center" width="60px">
|
||||
创建人
|
||||
</th>
|
||||
<th align="center" width="200px">
|
||||
<th align="center" width="150px">
|
||||
创建日期
|
||||
</th>
|
||||
<th align="center" width="200px">
|
||||
<th align="center" width="150px">
|
||||
修改日期
|
||||
</th>
|
||||
<th align="center" width="100px">
|
||||
@@ -86,6 +92,12 @@
|
||||
<td align="center">
|
||||
${bo.building_name!}
|
||||
</td>
|
||||
<td align="center">
|
||||
${bo.building_avg_price!}
|
||||
</td>
|
||||
<td align="center">
|
||||
${bo.avg_price!}
|
||||
</td>
|
||||
<td align="center">
|
||||
${bo.ratio!}
|
||||
</td>
|
||||
|
||||
+18
-1
@@ -27,7 +27,8 @@ public class BuildingRatio implements MongoEntity {
|
||||
private String region;
|
||||
private String district;
|
||||
private String building_name;
|
||||
|
||||
private String building_avg_price;
|
||||
private String avg_price;
|
||||
private Double ratio;
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date c_date;
|
||||
@@ -110,4 +111,20 @@ public class BuildingRatio implements MongoEntity {
|
||||
public void setNote(String note) {
|
||||
this.note = note;
|
||||
}
|
||||
@Column(name = "building_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;
|
||||
}
|
||||
@Column(name = "avg_price")
|
||||
public String getAvg_price() {
|
||||
return avg_price;
|
||||
}
|
||||
|
||||
public void setAvg_price(String avg_price) {
|
||||
this.avg_price = avg_price;
|
||||
}
|
||||
}
|
||||
|
||||
+4
-1
@@ -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);
|
||||
|
||||
@@ -15,6 +15,8 @@ public class BuildingRatioBo implements Serializable {
|
||||
private String region;
|
||||
private String district;
|
||||
private String building_name;
|
||||
private String building_avg_price;
|
||||
private String avg_price;
|
||||
private Double ratio;
|
||||
private Date c_date;
|
||||
private Date m_date;
|
||||
@@ -99,4 +101,20 @@ public class BuildingRatioBo implements Serializable {
|
||||
public void setNote(String note) {
|
||||
this.note = note;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
public String getAvg_price() {
|
||||
return avg_price;
|
||||
}
|
||||
|
||||
public void setAvg_price(String avg_price) {
|
||||
this.avg_price = avg_price;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user