合并分支 'lyh-server' 到 'master'

GXgeo设置



查看合并请求 !2324

@@ -30,8 +30,8 @@ class GeoQuestionResLogic extends BaseLogic
      */
     public function getCount(){
         $total = $this->model->counts(['project_id'=>$this->user['project_id']]);
-        $type_1 = $this->model->counts(['type'=>1,'project_id'=>$this->user['project_id']]);
-        $type_2 = $this->model->counts(['type'=>2,'project_id'=>$this->user['project_id']]);
+        $type_1 = $this->model->counts(['type'=>$this->model::BRAND_TYPE,'project_id'=>$this->user['project_id']]);
+        $type_2 = $this->model->counts(['type'=>$this->model::MARKETING_TYPE,'project_id'=>$this->user['project_id']]);
         return $this->success(['total'=>$total,'type_1'=>$type_1,'type_2'=>$type_2]);
     }
 

@@ -22,6 +22,9 @@ use App\Models\Base;
 class GeoQuestionResult extends Base
 {
     protected $table = 'gl_geo_question_result';
+
+    const BRAND_TYPE = 1;//品牌类型
+    const MARKETING_TYPE = 2;//营销类型
     /**
      * @remark :geo提交关键字获取器
      * @name   :getUrlAttribute