Merge branch 'master' of https://t-git.51gjj.com/fangbin/51business

app/controller/house/Export20190425.js

@@ -74,6 +74,7 @@ class Export20190425 extends Controller {
         let mysqlData = await ctx.realestateModel.NewHouse.findAll(filter);
         let ret = [];
         let reterr = [];
+        let errorId = [];
         if (mysqlData.length > 0) {
             for (let i in mysqlData) {
                 let data = {
@@ -92,7 +93,7 @@ class Export20190425 extends Controller {
                     decorationType: mysqlData[i].decoration_type || 0,
                     description: mysqlData[i].description || '',
                     openDate: mysqlData[i].open_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,
+                    dueDate: (mysqlData[i].due_date === undefined || mysqlData[i].due_date === 'Invalid date') ? null : mysqlData[i].due_date,
                     landArea: mysqlData[i].land_area,
                     houseArea: mysqlData[i].house_area,
                     areaRatio: mysqlData[i].area_ratio,
@@ -108,16 +109,17 @@ class Export20190425 extends Controller {
                     state: mysqlData[i].state,
                     remark: mysqlData[i].remark || '',
                 }
-                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' });
                 if (temp.status === 201) {
                     ret.push(temp);
                 } else {
-                    reterr.push(mysqlData[i]);
+                    errorId.push(mysqlData[i].id);
+                    reterr.push(temp);
                 }
             }
         }
-        ctx.success({ retL: ret.length, fl: mysqlData.length, error: reterr });
+        ctx.success({ retL: ret.length, fl: mysqlData.length, errorId: errorId, error: reterr });
     }