我的部门增加新增业绩

app/controller/api/user/User.php

@@ -1574,15 +1574,23 @@ class User extends BaseController
         $user = Db::name('user')->where('uid', $user_id)->field('uid,nickname,avatar,spread_uid,pv,create_time')->find();
         $child_nums = $this->getdepartmentStatistics($user_id);
         $child_nums_Tree = $this->buildTreePv($child_nums, $user['spread_uid']);
+        $new_performance = 0; //一周内新增总业绩
+        $end_time = date('Y-m-d ' . '00:00:00', strtotime('-7 days'));
         $person_nums_pv = 0;//大部门业绩
         $common_nums_pv = 0;//小部门业绩
         $aLL_list = [];//全部数据
         $person_list = [];//大部门数据
         $common_list = [];//小部门数据
         if(count($child_nums_Tree) && isset($child_nums_Tree[0]['children']) && count($child_nums_Tree[0]['children'])){
+            // 计算总新增业绩
+            $uid_list = array_column($child_nums, 'uid');
+            $new_performance = Db::name("user_pv_log")->where([['uid','in',$uid_list],['settlement_time','>',$end_time]])->sum('pv');
             //获取大部门的key
             $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_pv')), array_column($child_nums_Tree[0]['children'], 'total_pv'));
             foreach($child_nums_Tree[0]['children'] as $k=>$v){
+                $child_nums = $this->getdepartmentStatistics($v['uid']);
+                $uid_list = array_column($child_nums, 'uid');
+                $new_performance_child = Db::name("user_pv_log")->where([['uid','in',$uid_list],['settlement_time','>',$end_time]])->sum('pv');
                 if($k == $maxBalanceIndex){
                     $person_list[] = [
                         "uid" => $v["uid"],
@@ -1592,7 +1600,8 @@ class User extends BaseController
                         "pv" => $v['pv'],
                         "total_performance" => (int)$v['total_pv'],
                         "create_time" => $v['create_time'],
-                        'team_count'=> $v['team_count']
+                        'team_count'=> $v['team_count'],
+                        'new_performance' => $new_performance_child
                     ];
                     $person_nums_pv = bcadd($person_nums_pv,$v['total_pv']);
                 }else{
@@ -1604,7 +1613,8 @@ class User extends BaseController
                         "pv" => $v['pv'],
                         "total_performance" => (int)$v['total_pv'],
                         "create_time" => $v['create_time'],
-                        'team_count'=> $v['team_count']
+                        'team_count'=> $v['team_count'],
+                        'new_performance' => $new_performance_child
                     ];
                     $common_nums_pv = bcadd($common_nums_pv,$v['total_pv']);
                 }
@@ -1616,7 +1626,8 @@ class User extends BaseController
                     "pv" => $v['pv'],
                     "total_performance" => (int)$v['total_pv'],
                     "create_time" => $v['create_time'],
-                    'team_count'=> $v['team_count']
+                    'team_count'=> $v['team_count'],
+                    'new_performance' => $new_performance_child
                 ];
             }
         }
@@ -1657,7 +1668,7 @@ class User extends BaseController
             $data['teamid'] = $teamid;
             $data['team_list'] = $data1;
             $data['fans_num'] = $child_nums_Tree[0]['team_count'];//总人数
-            $data['new_performance'] = 0;//新增业绩
+            $data['new_performance'] = $new_performance;//新增总业绩
             $data['total_performance'] = (int)bcadd($child_nums_Tree[0]['total_pv'] ?? 0, 0, 2);//总业绩
             $data['person_nums'] = count($person_list);//大部门人数
             $data['common_nums'] = count($common_list);//小部门人数