Merge branch 'script_gj' into 'master'
后台:均价管理“楼栋系数管理”功能修改 See merge request !696
This commit is contained in:
+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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -392,12 +392,12 @@ class DealPriceDataProcess {
|
||||
|
||||
def deleteThirdPartyData(){
|
||||
def citys = CcbCommonUtils.citys_all
|
||||
def month = 202305
|
||||
def month = 202306
|
||||
def rows = []
|
||||
def cityCodeDatas = CcbCommonUtils.findCityCodeValue()
|
||||
def set = new HashSet()
|
||||
for(def city : citys) {
|
||||
def rets = findPeGteThirdParty2(city, 202306)
|
||||
def rets = findPeGteThirdParty2(city, 202307)
|
||||
def total = 0
|
||||
println city +" "+rets.size()
|
||||
if(rets){
|
||||
@@ -437,7 +437,7 @@ class DealPriceDataProcess {
|
||||
}
|
||||
|
||||
def findPeGteThirdParty2(cityName, yearmonth){
|
||||
def sql = "SELECT gujia_comm_id,gujiabds_to_mkprc_mny from t_app_p9pha_plda.avm_evaluation_item_gj_h where gujiabds_clc_yrmo_val=${yearmonth} and gujia_data_tp='第三方' and urbn_nm='${cityName}' and gujia_mns_rto>25"
|
||||
def sql = "SELECT gujia_comm_id,gujiabds_to_mkprc_mny from t_app_p9pha_plda.avm_evaluation_item_gj_h where gujiabds_clc_yrmo_val=${yearmonth} and gujia_data_tp='第三方' and urbn_nm='${cityName}' and gujia_mns_rto>20"
|
||||
def rets = []
|
||||
pgsqlInstance.eachRow(sql,{r->
|
||||
def map = [:]
|
||||
|
||||
+2
-2
@@ -52,7 +52,7 @@ class GuiDingPriceBatch extends BaseBatch{
|
||||
def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city)
|
||||
|
||||
//添加自己库中的人工指导价
|
||||
def prices = CcbCommonUtils.findPersonPrice(city, "2023-06-26", "2023-07-22")
|
||||
def prices = CcbCommonUtils.findPersonPrice(city, "2023-06-26", "2023-07-26")
|
||||
// def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22")
|
||||
if(prices){
|
||||
def distMap = getDistrictMap(city)
|
||||
@@ -85,7 +85,7 @@ class GuiDingPriceBatch extends BaseBatch{
|
||||
saveToPgSql(rows)
|
||||
//
|
||||
//更新静态数据表
|
||||
updateVersion(DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28")
|
||||
// updateVersion(DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28")
|
||||
|
||||
}
|
||||
|
||||
|
||||
+5
-2
@@ -292,12 +292,15 @@ class CommonDatautils {
|
||||
return rets;
|
||||
}
|
||||
|
||||
public static def findRemoveDistricts(def city, def cat, def fields, def m_date){
|
||||
public static def findRemoveDistricts(def city, def cat, def fields, def startDate, def endDate){
|
||||
DBObject q = new BasicDBObject();
|
||||
q.put("status", 1);
|
||||
q.put("cat", cat);
|
||||
q.put("city", city);
|
||||
q.put("m_date", new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD(m_date)))
|
||||
if(startDate){
|
||||
q.put("m_date", new BasicDBObject('$gte', startDate).append('$lt',endDate))
|
||||
}
|
||||
|
||||
DBObject keys = new BasicDBObject();
|
||||
if(fields){
|
||||
for(def field : fields){
|
||||
|
||||
+5
-2
@@ -97,7 +97,10 @@ class DistrictInfoExportBatch extends BaseBatch{
|
||||
saveOrUpdateFzDist(districts)
|
||||
|
||||
if(day == 15){
|
||||
def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, "2022-01-01");
|
||||
def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, DateUtils.parseFromTightYYYYMMDD("2022-01-01"), endMDate);
|
||||
remarkRemoveDist(removeDists)
|
||||
}else{
|
||||
def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, startMDate, endMDate);
|
||||
remarkRemoveDist(removeDists)
|
||||
}
|
||||
def fzDistricts = null
|
||||
@@ -197,7 +200,7 @@ class DistrictInfoExportBatch extends BaseBatch{
|
||||
for(def rd : removeDists){
|
||||
def udate = new BasicDBObject()
|
||||
udate.put("status",1)
|
||||
udate.put("m_date", new Date())
|
||||
udate.put("m_date", rd.m_date)
|
||||
FZ_DIST_COLL.update(new BasicDBObject('_id',rd.get('_id')), new BasicDBObject('$set', udate));
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -141,7 +141,7 @@ class DistrictPriceExportBatch extends BaseBatch{
|
||||
m << rMap.city
|
||||
m << rMap.region
|
||||
m << rMap.name
|
||||
if(curPrice){
|
||||
if(curPrice && rMap.status==0){
|
||||
m << curPrice
|
||||
}else{
|
||||
m << 0
|
||||
|
||||
@@ -520,7 +520,7 @@ class FiledStrand {
|
||||
buildStructure = "钢结构";
|
||||
}else if(val.indexOf("钢、钢筋混凝土")>-1){
|
||||
buildStructure = "钢、钢筋混凝土结构";
|
||||
}else if(val.indexOf("钢筋混凝土")>-1){
|
||||
}else if(val.indexOf("钢筋混凝土")>-1 || val.indexOf("钢混")>-1){
|
||||
buildStructure = "钢筋混凝土结构";
|
||||
}else if(val.indexOf("混合")>-1){
|
||||
buildStructure = "混合结构";
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ class DistrictFieldAddBatch extends BaseBatch{
|
||||
"virescence_percent":"greening_rate","cubage_percent":"plot_ratio","build_area":"build_area","all_area":"land_area","household_count":"households",
|
||||
"car_site_count":"parking_cnt","car_site":"parking_cnt","property_life":"land_usage_period","address":"address","build_structure":"building_structure",
|
||||
"build_type":"build_type", "land_property":"ownership_type","live_date":"live_date",
|
||||
"loop_line_info":"loop_line"]//key:seaweed表字段 value:es表字段
|
||||
"loop_line_info":"loop_line","loudong_count":"loudong_cnt"]//key:seaweed表字段 value:es表字段
|
||||
|
||||
def fieldsNameMap = ["estate_charge":"物业费","block":"板块","build_date":"建筑年代","estate_company":"物业公司","developer":"开发商",
|
||||
"virescence_percent":"绿化率","cubage_percent":"容积率","build_area":"建筑面积","all_area":"占地面积","household_count":"户型",
|
||||
|
||||
@@ -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