Merge branch 'xggsve-order-dev' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-order-dev

xggsve-order/app/base/service/impl/order/oorderSve.js

@@ -198,7 +198,7 @@ class OorderService extends ServiceBase {
     var orderby = [
     var orderby = [
       ["id", 'desc']
       ["id", 'desc']
     ];
     ];
-    this.addWhereTime(where, 'created_at', params.beginDate, params.endDate);
+    this.addWhereTime(where, 'created_at', params.createdBegin, params.createdEnd);
 
 
     try {
     try {
       var page = await this.getPageList(currentPage, pageSize, where, orderby, null);
       var page = await this.getPageList(currentPage, pageSize, where, orderby, null);
@@ -211,6 +211,10 @@ class OorderService extends ServiceBase {
       //格式化业务员
       //格式化业务员
       await this.formateStatus(page.rows);
       await this.formateStatus(page.rows);
 
 
+      for(let item of page.rows) {
+        this.handleDate(item, ["created_at","sign_time"], "YYYY-MM-DD HH:mm:ss", -8);
+      }
+
       return system.getResult(page);
       return system.getResult(page);
     } catch (error) {
     } catch (error) {
       console.log(error);
       console.log(error);