1

niucloud/app/api/controller/apiController/Campus.php

@@ -39,4 +39,8 @@ class Campus extends BaseApiService
         }
         return success($res['data']);
     }
+
+    public function get_campuses_list(){
+        return success(( new CampusService() )->get_campuses_list());
+    }
 }

niucloud/app/api/controller/apiController/CustomerResources.php

@@ -88,6 +88,7 @@ class CustomerResources extends BaseApiService
 //            新资源有2节体验课
             "trial_class_count" => 2,
             "rf_type" => get_role_type($role_id),
+            'campus' => $param['campus'] ?? '',
         ];
 
         $six_speed_data = [
@@ -98,6 +99,7 @@ class CustomerResources extends BaseApiService
             "distance" => $request->param('distance', ''),//距离
             "communication" => $request->param('communication', ''),//沟通备注
             "staff_id" => $request->param('staff_id', ''),//人员ID
+            "efficacious" => $request->param('efficacious', 1),
         ];
 
         if (strlen($customer_resources_data['phone_number']) > 12) {
@@ -175,6 +177,7 @@ class CustomerResources extends BaseApiService
 
             "first_visit_status" => $request->param('first_visit_status', null),//一访情况
             "second_visit_status" => $request->param('second_visit_status', null),//二访情况
+            "efficacious" => $request->param('efficacious', 1),
         ];
 
 

niucloud/app/api/controller/apiController/ResourceSharing.php

@@ -31,6 +31,7 @@ class ResourceSharing extends BaseApiService
         $shared_by = $request->param('shared_by','');//共享人ID
         $name = $request->param('name','');////客户资源表-姓名
         $phone_number = $request->param('phone_number','');//客户资源表-手机号
+        $campus_name = $request->param('campus_name','');//客户资源表-校区
 
         $shared_at_str = $request->param('shared_at_str','');//共享时间|[开始时间(Y-m-d),结束时间(Y-m-d)]
         $shared_at_arr = [];
@@ -45,6 +46,7 @@ class ResourceSharing extends BaseApiService
             'shared_at_arr'=>$shared_at_arr,
             'name'=>$name,
             'phone_number'=>$phone_number,
+            'campus_name' => $campus_name
         ];
         $res=  (new ResourceSharingService())->getList($where);
         return success($res);

niucloud/app/api/controller/member/Member.php

@@ -115,4 +115,8 @@ class Member extends BaseApiController
         ]);
         return success(( new AuthService() )->getMobile($data[ 'mobile_code' ]));
     }
+
+    public function get_campuses_list(){
+        return success(( new MemberService() )->get_campuses_list());
+    }
 }

niucloud/app/api/route/member.php

@@ -105,6 +105,9 @@ Route::group('member', function () {
     //获取签到设置
     Route::get('sign/config', 'member.MemberSign/signConfig');
 
+
+
+
 })->middleware(ApiChannel::class)
     ->middleware(ApiCheckToken::class, true)
     ->middleware(ApiLog::class);

niucloud/app/api/route/route.php

@@ -254,6 +254,8 @@ Route::group(function () {
     //校区-获取员工下的全部校区
     Route::get('campus/getPersonnelCampus', 'apiController.Campus/getPersonnelCampus');
 
+    Route::get('campus/get_campuses_list', 'apiController.Campus/get_campuses_list');
+
     //员工考勤-列表(员工打卡/请假/签退)
     Route::post('attendance/index', 'apiController.Attendance/index');
     //员工考勤-编辑(员工打卡/请假/签退)

niucloud/app/common.php

@@ -1237,7 +1237,7 @@ function get_dict_value($key, $value)
         $map[$item['value']] = $item['name'];
     }
 
-    return $map[$value];
+    return $map[$value] ?? '未知';
 }
 
 

niucloud/app/service/api/apiService/CampusService.php

@@ -87,5 +87,12 @@ class CampusService extends BaseApiService
     }
 
 
+    public function get_campuses_list(){
+        $campus = new Campus();
+        $list = $campus->select()->toArray();
+        return $list;
+    }
+
+
 
 }

niucloud/app/service/api/apiService/ResourceSharingService.php

@@ -38,9 +38,16 @@ class ResourceSharingService extends BaseApiService
         $limit = $page_params['limit'];
 
         $person_id = $this->member_id;//当前登录的员工id
+        $campus_where = [];
+        $campus_where[] = ['person_id','=',$person_id];
+
+        if (!empty($where['campus_name'])) {
+            $campus_where[] = ['campus_name','like','%'.$where['campus_name'].'%'];
+        }
+
 
         //查当前用户的归属校区
-        $campus_id = CampusPersonRole::where('person_id', $person_id)
+        $campus_id = CampusPersonRole::where($campus_where)
             ->distinct(true)
             ->column('campus_id');
         if ($campus_id) {
@@ -86,11 +93,19 @@ class ResourceSharingService extends BaseApiService
             'customerResource' => function ($query) {
                 $query->append(['initial_intent_name']);
             }
-        ])->paginate([
+        ])
+            ->withJoin(['customerResource'])
+            ->order('customerResource.updated_at', 'desc')
+        ->paginate([
             'list_rows' => $limit,
             'page' => $page,
         ])->toArray();
 
+
+        foreach ($res['data'] as &$item){
+            $item['customerResource']['source_channel'] = get_dict_value('source',$item['customerResource']['source_channel']);
+        }
+
         return $res;
 
     }

niucloud/app/service/api/member/MemberService.php

@@ -11,6 +11,7 @@
 
 namespace app\service\api\member;
 
+use app\model\campus\Campus;
 use app\model\member\Member;
 use app\service\core\member\CoreMemberService;
 use core\base\BaseApiService;
@@ -157,4 +158,11 @@ class MemberService extends BaseApiService
             event("MemberLoginAfter", ['member_id' => $this->member_id]);
         }
     }
+
+    public function get_campuses_list(){
+        $campus = new Campus();
+        $list = $campus->select()->toArray();
+        return $list;
+
+    }
 }