diff --git a/niucloud/app/api/controller/apiController/CustomerResources.php b/niucloud/app/api/controller/apiController/CustomerResources.php index e635e941..46589fd8 100644 --- a/niucloud/app/api/controller/apiController/CustomerResources.php +++ b/niucloud/app/api/controller/apiController/CustomerResources.php @@ -149,6 +149,7 @@ class CustomerResources extends BaseApiService //客户资源数据 $customer_resources_data = [ + "campus" => $request->param('campus', ''), "source_channel" => $request->param('source_channel', ''),//来源渠道 "source" => $request->param('source', ''),//来源 "name" => $request->param('name', ''),//姓名 diff --git a/niucloud/app/api/controller/member/Member.php b/niucloud/app/api/controller/member/Member.php index f6c9c19d..25a4b059 100644 --- a/niucloud/app/api/controller/member/Member.php +++ b/niucloud/app/api/controller/member/Member.php @@ -119,4 +119,8 @@ class Member extends BaseApiController public function get_campuses_list(){ return success(( new MemberService() )->get_campuses_list()); } + + public function list_call_up(){ + return success(( new MemberService() )->list_call_up()); + } } diff --git a/niucloud/app/api/route/member.php b/niucloud/app/api/route/member.php index 47100325..6d4dbbad 100644 --- a/niucloud/app/api/route/member.php +++ b/niucloud/app/api/route/member.php @@ -105,6 +105,8 @@ Route::group('member', function () { //获取签到设置 Route::get('sign/config', 'member.MemberSign/signConfig'); + Route::get('list_call_up', 'member.MemberSign/signConfig'); + diff --git a/niucloud/app/common.php b/niucloud/app/common.php index 4807fc8e..0fee5199 100644 --- a/niucloud/app/common.php +++ b/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] ?? ''; } diff --git a/niucloud/app/service/api/apiService/ResourceSharingService.php b/niucloud/app/service/api/apiService/ResourceSharingService.php index ff9d8d65..23a655e1 100644 --- a/niucloud/app/service/api/apiService/ResourceSharingService.php +++ b/niucloud/app/service/api/apiService/ResourceSharingService.php @@ -111,13 +111,13 @@ class ResourceSharingService extends BaseApiService ->select() ->toArray(); -dd($campus_name,$campus_ids); $resultdata = []; foreach ($subQuery as $item) { $resultdata[$item['resource_id']] = $item['max_time']; } foreach ($res['data'] as &$item){ + $item['customerResource']['source'] = get_dict_value('source',$item['customerResource']['source']); $item['customerResource']['source_channel'] = get_dict_value('source',$item['customerResource']['source_channel']); $item['customerResource']['campus_name'] = $campus_name[$item['customerResource']['campus']] ?? ''; $item['customerResource']['communication_time'] = $resultdata[$item['resource_id']] ?? ''; diff --git a/niucloud/app/service/api/member/MemberService.php b/niucloud/app/service/api/member/MemberService.php index d9b5fd88..b5fd6da5 100644 --- a/niucloud/app/service/api/member/MemberService.php +++ b/niucloud/app/service/api/member/MemberService.php @@ -12,6 +12,7 @@ namespace app\service\api\member; use app\model\campus\Campus; +use app\model\communication_records\CommunicationRecords; use app\model\member\Member; use app\service\core\member\CoreMemberService; use core\base\BaseApiService; @@ -165,4 +166,9 @@ class MemberService extends BaseApiService return $list; } + + public function list_call_up($resource_id){ + $campus = new CommunicationRecords(); + return $campus->where('resource_id',$resource_id)->select()->toArray(); + } }