Commit e7a881a5 authored by Hsinli's avatar Hsinli

fix

parent f98223b0
Pipeline #7097 passed with stage
in 24 seconds
...@@ -73,6 +73,7 @@ class Export20190425 extends Controller { ...@@ -73,6 +73,7 @@ class Export20190425 extends Controller {
}; };
let mysqlData = await ctx.realestateModel.NewHouse.findAll(filter); let mysqlData = await ctx.realestateModel.NewHouse.findAll(filter);
let ret = []; let ret = [];
let reterr = [];
if (mysqlData.length > 0) { if (mysqlData.length > 0) {
for (let i in mysqlData) { for (let i in mysqlData) {
let data = { let data = {
...@@ -91,7 +92,7 @@ class Export20190425 extends Controller { ...@@ -91,7 +92,7 @@ class Export20190425 extends Controller {
decorationType: mysqlData[i].decoration_type || 0, decorationType: mysqlData[i].decoration_type || 0,
description: mysqlData[i].description || '', description: mysqlData[i].description || '',
openDate: mysqlData[i].open_date, openDate: mysqlData[i].open_date,
dueDate: mysqlData[i].due_date === '0000-00-00 00:00:00' ? null : mysqlData[i].due_date, dueDate: (mysqlData[i].due_date === undefined || mysqlData[i].due_date === "0000-00-00 00:00:00" || mysqlData[i].due_date === 'Invalid date') ? null : mysqlData[i].due_date,
landArea: mysqlData[i].land_area, landArea: mysqlData[i].land_area,
houseArea: mysqlData[i].house_area, houseArea: mysqlData[i].house_area,
areaRatio: mysqlData[i].area_ratio, areaRatio: mysqlData[i].area_ratio,
...@@ -100,7 +101,7 @@ class Export20190425 extends Controller { ...@@ -100,7 +101,7 @@ class Export20190425 extends Controller {
planParks: mysqlData[i].plan_parks, planParks: mysqlData[i].plan_parks,
planNearBy: mysqlData[i].plan_near_by, planNearBy: mysqlData[i].plan_near_by,
preSalePermit: mysqlData[i].pre_sale_permit, preSalePermit: mysqlData[i].pre_sale_permit,
preSalePermitDate: mysqlData[i].pre_sale_permit_date === '暂无信息' ? null : mysqlData[i].pre_sale_permit_date, preSalePermitDate: (mysqlData[i].pre_sale_permit_date === '暂无信息' || mysqlData[i].pre_sale_permit_date === '-') ? null : mysqlData[i].pre_sale_permit_date,
buildingNumbers: mysqlData[i].building_numbers, buildingNumbers: mysqlData[i].building_numbers,
cornerMarker: mysqlData[i].corner, cornerMarker: mysqlData[i].corner,
orderNum: mysqlData[i].order_num, orderNum: mysqlData[i].order_num,
...@@ -109,10 +110,14 @@ class Export20190425 extends Controller { ...@@ -109,10 +110,14 @@ class Export20190425 extends Controller {
} }
ctx.logger.info(JSON.stringify(data)); ctx.logger.info(JSON.stringify(data));
let temp = await ctx.helper.send_request(this.config.HOUSE_SERVICE_API + '/v1/newhouse/', data, { method: 'POST' }); let temp = await ctx.helper.send_request(this.config.HOUSE_SERVICE_API + '/v1/newhouse/', data, { method: 'POST' });
if (temp.status === 201) {
ret.push(temp); ret.push(temp);
} else {
reterr.push(mysqlData[i]);
} }
} }
ctx.success(ret.length); }
ctx.success({ retL: ret.length, fl: mysqlData.length, error: reterr });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment