Commit 6be217e5 authored by clone's avatar clone

bug

parent 5dadeac4
...@@ -179,6 +179,7 @@ class PerformanceService ...@@ -179,6 +179,7 @@ class PerformanceService
} }
$condition['create_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) ); $condition['create_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) );
$condition["is_case"] = $is_case;
$result = $this->nowTimeSum($condition, 2); $result = $this->nowTimeSum($condition, 2);
if (count($result) > 0 && $house_id == 0) { if (count($result) > 0 && $house_id == 0) {
$result["house_arr"] = $house_id_arr; $result["house_arr"] = $house_id_arr;
...@@ -231,7 +232,7 @@ class PerformanceService ...@@ -231,7 +232,7 @@ class PerformanceService
break; break;
} }
$result = $this->getOrderList($params, $type); $result = $this->getOrderList($params, $type,$is_case);
if (count($result) > 0) { if (count($result) > 0) {
return $result; return $result;
} else { } else {
...@@ -240,7 +241,7 @@ class PerformanceService ...@@ -240,7 +241,7 @@ class PerformanceService
} }
public function getOrderList($params, $type) public function getOrderList($params, $type,$is_case)
{ {
$result = []; $result = [];
//1带看 2进场 3收款 4成交报告 //1带看 2进场 3收款 4成交报告
...@@ -260,7 +261,7 @@ class PerformanceService ...@@ -260,7 +261,7 @@ class PerformanceService
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,d.internal_title,d.internal_address";
$result = $this->bargainModel->getAddBargainOrderList($field, $params); $result = $this->bargainModel->getAddBargainOrderList($field, $params,$is_case);
break; break;
default: default:
......
...@@ -679,8 +679,9 @@ class OBargainModel extends Model ...@@ -679,8 +679,9 @@ class OBargainModel extends Model
} elseif ($type == 3) { } elseif ($type == 3) {
$field = "count(1) as num"; $field = "count(1) as num";
$where_["a.trade_type"] = 10; $where_["a.trade_type"] = 10;
//$where_["a.father_id"] = 0; if (isset($params["is_case"]) && $params["is_case"] == 2) {
$where_["a.father_id"] = 0;
}
array_push($join, [ ' o_report c', 'a.report_id=c.id', 'left' ]); array_push($join, [ ' o_report c', 'a.report_id=c.id', 'left' ]);
} }
...@@ -787,7 +788,7 @@ class OBargainModel extends Model ...@@ -787,7 +788,7 @@ class OBargainModel extends Model
->select(); ->select();
} }
public function getAddBargainOrderList($field, $params) public function getAddBargainOrderList($field, $params, $is_case)
{ {
$where_ = []; $where_ = [];
...@@ -797,7 +798,9 @@ class OBargainModel extends Model ...@@ -797,7 +798,9 @@ class OBargainModel extends Model
} }
if (isset($params["create_time"])) { if (isset($params["create_time"])) {
$where_["a.create_time"] = $params["create_time"]; $where_["a.create_time"] = $params["create_time"];
//$where_["a.father_id"] = 0; if ($is_case == 2) {
$where_["a.father_id"] = 0;
}
$where_["a.trade_type"] = 10; $where_["a.trade_type"] = 10;
} }
......
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