1

application/api_broker/service/SquareService.php

@@ -110,6 +110,18 @@ class SquareService
             $agent = $this->redis->getRedisCache(2, $val['agent_id']) ;
             $res[$key]['name'] = $agent['name'];
             $res[$key]['image_path'] = AGENTHEADERIMGURL . $agent['img'];
+
+            //部门标签
+            $res[$key]['district_lable_name'] = '一部';
+            foreach ($this->getDistrictLable() as $key1 => $val1) {
+                if($res[$key1]['district_lable_id'] == $val1['id']){
+                    $res[$key1]['district_lable_name'] = $val1['name'];
+                    continue;
+                }
+            }
+
+            //评论数
+            $res[$key]['comment_num'] = $this->getCommenNum($val['id']);
         }
 
         return [ 'data' => $res, 'total' => $res_total ];
@@ -137,9 +149,9 @@ class SquareService
             $res[$key]['img'] = AGENTHEADERIMGURL . $agent['img'];
 
             $get_params = [];
-            $list = [];
             $field = 'CommentExt.id,CommentExt.level,CommentExt.comment,CommentExt.agent_id_a,CommentExt.agent_id_b';//
             $get_params['CommentExt.comment_id'] = $val['id'];
+            $get_params['CommentExt.is_del'] = 0;
 
             $res[$key]['comment_ext']['total']= $this->m_coment_ext->getSquareCommentExtListTotal($field,$get_params);
             $list = $this->m_coment_ext->getSquareCommentExtList(1, 2, $field, $get_params);
@@ -336,4 +348,15 @@ class SquareService
         return [ 'data' => $res, 'total' => $res_total ];
     }
 
+    /**
+     * 开盘广场列表 评论数
+     * @param $id
+     * @return int|string
+     */
+    public function getCommenNum($id){
+        $get_params['square_id'] = $id;
+        $get_params['is_del'] = 0;
+        $res = $this->m_coment->getCommenNum($get_params);
+        return $res;
+    }
 }
\ No newline at end of file

application/api_broker/service/StatementService.php

@@ -296,7 +296,7 @@ class StatementService
 
                 //todo 上周业绩
                 $where_                = [];
-                $start_time            = date("Y-m-d", strtotime("-14 day"));
+                $start_time            = date("Y-m-d", strtotime("-13 day"));
                 $end_time              = date("Y-m-d", strtotime("-7 day"));
 //                $where_["district_id"] = $district_id;
                 $where_["agent_id"] = $conditions["agent_id"];
@@ -305,6 +305,7 @@ class StatementService
 
                 $performanceSum                               = $this->bargainModel->getAddBargainNum($where_, 1);//1表示业绩 2表示实收
                 $result["director_last_week_performance_num"] = isset($performanceSum[0]["num"]) ? $performanceSum[0]["num"] : 0;
+                big_log($result["director_last_week_performance_num"]);
                 //todo 本周周业绩
                 $where_                = [];
                 $start_time            = date("Y-m-d", strtotime("-7 day"));

application/model/BComment.php

@@ -67,4 +67,13 @@ class BComment extends Model
         return $result;
     }
 
+    public function getCommenNum($params)
+    {
+        $result = Db::table($this->table)
+            ->where($params)
+            ->count();
+        // dump($this->getLastSql());
+        return $result;
+    }
+
 }

application/model/BSquare.php

@@ -56,7 +56,7 @@ class BSquare extends Model
             ->page($pageNo)
             ->order($order)
             ->select();
-        //dump($this->getLastSql());
+        // dump($this->getLastSql());
         return $result;
     }
 

application/model/OBargainModel.php

@@ -786,8 +786,7 @@ class OBargainModel extends Model
             ->join($join)
             ->where($where_)
             ->select();
-        /*echo $this->getLastSql();
-        echo '------------------';*/
+        big_log($this->getLastSql());
         return $return;
     }
     public function getAddBargainNumV2($params, $type)