Commit cdd8cc23 authored by hujun's avatar hujun

report_id

parent 16ea6b1b
...@@ -112,13 +112,13 @@ class Evaluation extends Basic ...@@ -112,13 +112,13 @@ class Evaluation extends Basic
$m_bargain = new OBargainModel(); $m_bargain = new OBargainModel();
$bargain_where['id'] = $bargain_id; $bargain_where['id'] = $bargain_id;
$bargain_where['father_id'] = 0; $bargain_where['father_id'] = 0;
$order_id = $m_bargain->getFieldValue('order_id', $bargain_where); $bargain_data = $m_bargain->getDetail('order_id,report_id', $bargain_where);
if (empty($order_id)) { if (empty($bargain_data)) {
return $this->response(101, '没有该记录'); return $this->response(101, '没有该记录');
} }
$evaluate_where['source'] = 20; $evaluate_where['source'] = 20;
$evaluate_where['record_id'] = $bargain_id; $evaluate_where['record_id'] = $bargain_data['report_id'];
$field = 'evaluate_grade,evaluate_grade_attitude,evaluate_grade_clothing,evaluate_content,create_time,user_id'; $field = 'evaluate_grade,evaluate_grade_attitude,evaluate_grade_clothing,evaluate_content,create_time,user_id';
$evaluate_data = $this->evaluateModel->getAgentEvaluateFraction($field, $evaluate_where); $evaluate_data = $this->evaluateModel->getAgentEvaluateFraction($field, $evaluate_where);
...@@ -131,7 +131,7 @@ class Evaluation extends Basic ...@@ -131,7 +131,7 @@ class Evaluation extends Basic
$list[$k]['create_time'] = $v['create_time']; $list[$k]['create_time'] = $v['create_time'];
$list[$k]['user_id'] = $v['user_id']; $list[$k]['user_id'] = $v['user_id'];
$list[$k]['evaluate_content'] = $v['evaluate_content']; $list[$k]['evaluate_content'] = $v['evaluate_content'];
$list[$k]['order_id'] = $order_id; $list[$k]['order_id'] = $bargain_data['order_id'];
$list[$k]['grade_string'] = '专业'.$evaluate_grade.'/态度'.$evaluate_grade_attitude.'/着装'.$evaluate_grade_clothing; $list[$k]['grade_string'] = '专业'.$evaluate_grade.'/态度'.$evaluate_grade_attitude.'/着装'.$evaluate_grade_clothing;
} }
return $this->response(200, '', $list); return $this->response(200, '', $list);
......
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