后天带看搜索增加条件，C端客户评价方法重写

application/api/controller/Broker.php

@@ -227,51 +227,36 @@ class Broker extends Basic
         }
 
         if (is_numeric($params['type'])) {
-            $type = $params['type'];
+            $params['type'] = $params['type'];
         }else{
-            $type = 0;
+            $params['type'] = 0;
         }
 
-        $date   = date('Y-m-d H:i:s');
         $id_arr = [];
         if (isset($params['sign_name'])) {
             $evaluate_sign = new EvaluateSign();
             foreach ($params['sign_name'] as $v) {
-                $sign_data[] = [
+                $sign_data = [
                     'sign_name' => $v,
                     'point_obj' => 0,
                     'is_del' => 0,
-                    'create_time' => $date,
-                    'update_time' => $date,
                 ];
-            }
-            $result = $evaluate_sign->saveAll($sign_data);
-            foreach ($result as $vv) {
-                $id_arr[] = $vv->id;
+
+                $id_arr[] = $evaluate_sign->editEvaluationSignData($sign_data);
             }
         }
 
         $evaluate = new Evaluate();
-        $evaluate->save([
-            'user_id' => $this->userId,
-            'agents_id' => $params['agents_id'],
-            'source' => $params['source'],
-            'record_id' => $params['record_id'],
-            'evaluate_grade' => $params['evaluate_grade'],
-            'evaluate_content' => $params['evaluate_content'],
-            'evaluate_sign' => implode(',', $id_arr),
-            'create_time' => $date,
-            'update_time' => $date,
-            'is_show' => 0,
-            'type' => $type,
-            'house_id' => $params['house_id']
-        ]);
-
-        if ($evaluate->id) {
-
+        $params['evaluate_sign'] = $id_arr;
+        $id = $evaluate->editEvaluationData($params, $this->userId);
+        if ($id) {
+            //去除未推送消息
             $m_push = new OPushMessageModel();
-            $m_push->updateData(['status'=>1], ['user_id' => $this->userId, 'house_id' => $params['house_id'], 'operation_id' => $params['agents_id'],]);
-            $data['data']   = [ 'id' => $evaluate->id ];
+            $where['user_id'] = $this->userId;
+            $where['operation_id'] = $params['agents_id'];
+            $where['house_id'] = $params['house_id'];
+            $m_push->updateData(['status'=>1], $where);
+            $data['data']   = [ 'id' => $id];
             $data['status'] = 200;
             $data['msg']    = '评价成功';
         } else {

application/index/controller/Evaluation.php

@@ -69,12 +69,13 @@ class Evaluation extends Basic
             $where['a.source']              = 10 ;
             $where['a.create_time']   = ['between time', [$params['march_in_time_start']. ' 00:00:00', $params['march_in_time_end'] . ' 23:59:59']];
         }
-        //7.评价类型:1带看 2成交记录表
-        if (!empty($params['source'])) {
-            if ($params['source'] == 1) {
-                $where['a.source'] = 10;
+        //7.评价类型:1带看 2收款
+        if (!empty($params['type'])) {
+            $where['a.source'] = 10;
+            if ($params['type'] == 1) {
+                $where['a.type'] = 0;
             } else {
-                $where['a.source'] = 20;
+                $where['a.type'] = ['>', 0];
             }
         }
         //搜索条件 end

application/model/Evaluate.php

@@ -202,4 +202,49 @@ class Evaluate extends Model
     public function updateData($data, $where) {
         return $this->where($where)->update($data);
     }
+
+    /**
+     * @param $data
+     * @param $user_id
+     * @return int|string
+     */
+    public function editEvaluationData($data, $user_id) {
+        $save_data['user_id'] = $user_id;
+        $save_data['create_time'] = date('Y-m-d H:i:s');
+        $save_data['is_show'] = 0;
+
+        if (!empty($data['agents_id'])) {
+            $save_data['agents_id'] = $data['agents_id'];
+        }
+        if (!empty($data['source'])) {
+            $save_data['source'] = $data['source'];
+        }
+        if (!empty($data['record_id'])) {
+            $save_data['record_id'] = $data['record_id'];
+        }
+        if (!empty($data['evaluate_grade'])) {
+            $save_data['evaluate_grade'] = $data['evaluate_grade'];
+        }
+        if (!empty($data['evaluate_content'])) {
+            $save_data['evaluate_content'] = $data['evaluate_content'];
+        }
+        if (!empty($data['evaluate_sign'])) {
+            $save_data['evaluate_sign'] = implode(',', $data['evaluate_sign']);
+        }
+        if (!empty($data['type'])) {
+            $save_data['type'] = $data['type'];
+        }
+        if (!empty($data['house_id'])) {
+            $save_data['house_id'] = $data['house_id'];
+        }
+        if (empty($data['id'])) {
+            $id = $this->insertGetId($save_data);
+        } else {
+            $save_data['update_time'] = date('Y-m-d H:i:s');
+            $this->where('id',$data['id'])->update($save_data);
+            $id = $data['id'];
+        }
+
+        return $id;
+    }
 }

application/model/EvaluateSign.php

@@ -8,4 +8,30 @@ class EvaluateSign extends Model
 {
     // 设置当前模型对应的完整数据表名称
     protected $table = 'u_evaluate_sign';
+
+    /**
+     * @param $data
+     * @param $user_id
+     * @return int|string
+     */
+    public function editEvaluationSignData($data) {
+        $save_data['create_time'] = date('Y-m-d H:i:s');
+        $save_data['is_del'] = 0;
+
+        if (!empty($data['sign_name'])) {
+            $save_data['sign_name'] = $data['sign_name'];
+        }
+        if (!empty($data['point_obj'])) {
+            $save_data['point_obj'] = $data['point_obj'];
+        }
+        if (empty($data['id'])) {
+            $id = $this->insertGetId($save_data);
+        } else {
+            $save_data['update_time'] = date('Y-m-d H:i:s');
+            $this->where('id',$data['id'])->update($save_data);
+            $id = $data['id'];
+        }
+
+        return $id;
+    }
 }

public/resource/js/evaluationList.js

@@ -142,7 +142,7 @@ define(['doT', 'text!temp/evaluation_list_template_tpl.html', 'css!style/home.cs
             params.store_id =$('#guest_stores').val()*1;
             params.user_nick =$('#user_name').val();
             params.user_phone =$('#user_phone').val();
-            params.source =$('#evaluation_type').val();
+            params.type =$('#evaluation_type').val();
             params.pageNo = follow.pageNo;
             params.pageSize = follow.pageSize;
 			$.ajax({