Commit 19bb271b authored by clone's avatar clone

bug

parent 60451a34
...@@ -240,20 +240,20 @@ class PerformanceService ...@@ -240,20 +240,20 @@ class PerformanceService
//1带看 2进场 3收款 4成交报告 //1带看 2进场 3收款 4成交报告
switch ($type) { switch ($type) {
case 1: case 1:
$field = "DATE(a.create_time) as create_time,a.user_phone,a.user_name,a.user_id,b.house_id,d.internal_title,d.internal_address"; $field = "DATE(a.create_time) as create_time,a.user_phone,a.user_name,a.user_id,b.house_id";
$result = $this->reportModel->getAddReportOrderList($field, $params); $result = $this->reportModel->getAddReportOrderList($field, $params);
break; break;
case 2: case 2:
$field = "DATE(a.create_time) as create_time ,b.house_id,b.house_title,c.user_phone,c.user_name,c.user_id,d.internal_title,d.internal_address"; $field = "DATE(a.create_time) as create_time ,b.house_id,b.house_title,c.user_phone,c.user_name,c.user_id";
$result = $this->marchInModel->getAddMarchInOrderList($field, $params); $result = $this->marchInModel->getAddMarchInOrderList($field, $params);
break; break;
case 3: case 3:
$field = "DATE(a.create_time) as create_time ,b.house_id,b.house_title,c.user_phone,c.user_name,c.user_id,d.internal_title,d.internal_address"; $field = "DATE(a.create_time) as create_time ,b.house_id,b.house_title,c.user_phone,c.user_name,c.user_id";
$result = $this->payLogModel->getAddPayLogOrderList($field, $params); $result = $this->payLogModel->getAddPayLogOrderList($field, $params);
break; break;
case 4: case 4:
$field = "DATE(a.create_time) as create_time ,b.house_id,b.house_title,c.user_phone,c.user_name,c.user_id,d.internal_title,d.internal_address"; $field = "DATE(a.create_time) as create_time ,b.house_id,b.house_title,c.user_phone,c.user_name,c.user_id";
$result = $this->bargainModel->getAddBargainOrderList($field, $params, $is_case); $result = $this->bargainModel->getAddBargainOrderList($field, $params, $is_case);
break; break;
default: default:
......
...@@ -867,7 +867,7 @@ class OBargainModel extends Model ...@@ -867,7 +867,7 @@ class OBargainModel extends Model
->alias("a") ->alias("a")
->join("o_order b", "a.order_id = b.id", "left") ->join("o_order b", "a.order_id = b.id", "left")
->join("o_report c", "b.f_id = c.id", "left") ->join("o_report c", "b.f_id = c.id", "left")
->join('g_houses d', 'b.house_id = d.id', 'left') //->join('g_houses d', 'b.house_id = d.id', 'left')
->where($where_) ->where($where_)
->select(); ->select();
//echo Db::table($this->table)->getLastSql(); //echo Db::table($this->table)->getLastSql();
......
...@@ -267,7 +267,7 @@ class OMarchInModel extends Model ...@@ -267,7 +267,7 @@ class OMarchInModel extends Model
->alias("a") ->alias("a")
->join("o_order b", "a.order_id = b.id", "left") ->join("o_order b", "a.order_id = b.id", "left")
->join("o_report c", "b.f_id = c.id", "left") ->join("o_report c", "b.f_id = c.id", "left")
->join('g_houses d', 'b.house_id = d.id', 'left') // ->join('g_houses d', 'b.house_id = d.id', 'left')
->where($where_) ->where($where_)
->select(); ->select();
} }
......
...@@ -263,8 +263,9 @@ class OPayLogModel extends Model ...@@ -263,8 +263,9 @@ class OPayLogModel extends Model
->alias("a") ->alias("a")
->join("o_order b","a.order_id = b.id","left") ->join("o_order b","a.order_id = b.id","left")
->join("o_report c","b.f_id = c.id","left") ->join("o_report c","b.f_id = c.id","left")
->join('g_houses d','b.house_id = d.id','left') //->join('g_houses d','b.house_id = d.id','left')
->where($where_) ->where($where_)
->group("a.id")
->select(); ->select();
} }
......
...@@ -659,7 +659,7 @@ class OReportModel extends Model ...@@ -659,7 +659,7 @@ class OReportModel extends Model
->field($field) ->field($field)
->alias("a") ->alias("a")
->join("o_order b", "a.id = b.f_id", "left") ->join("o_order b", "a.id = b.f_id", "left")
->join('g_houses d', 'b.house_id = d.id', 'left') // ->join('g_houses d', 'b.house_id = d.id', 'left')
->where($where_) ->where($where_)
->group("a.id") ->group("a.id")
->select(); ->select();
......
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