|
|
@ -68,7 +68,8 @@ class StudentService extends BaseAdminService |
|
|
* 组合整理数据 |
|
|
* 组合整理数据 |
|
|
* @param $data |
|
|
* @param $data |
|
|
*/ |
|
|
*/ |
|
|
public function makeUp($data){ |
|
|
public function makeUp($data) |
|
|
|
|
|
{ |
|
|
//会员标签 |
|
|
//会员标签 |
|
|
if (!empty($data['member_label'])) { |
|
|
if (!empty($data['member_label'])) { |
|
|
$data['member_label_array'] = (new StudentLabelService())->getMemberLabelListByLabelIds($data['member_label']); |
|
|
$data['member_label_array'] = (new StudentLabelService())->getMemberLabelListByLabelIds($data['member_label']); |
|
|
@ -114,26 +115,40 @@ class StudentService extends BaseAdminService |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public function getCustomerResourcesAll(){ |
|
|
public function getCustomerResourcesAll() |
|
|
|
|
|
{ |
|
|
$customerResourcesModel = new CustomerResources(); |
|
|
$customerResourcesModel = new CustomerResources(); |
|
|
return $customerResourcesModel->select()->toArray(); |
|
|
return $customerResourcesModel->select()->toArray(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public function getCampusAll(){ |
|
|
public function getCampusAll() |
|
|
|
|
|
{ |
|
|
$campusModel = new Campus(); |
|
|
$campusModel = new Campus(); |
|
|
return $campusModel->select()->toArray(); |
|
|
return $campusModel->select()->toArray(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public function getClassGradeAll(){ |
|
|
public function getClassGradeAll() |
|
|
|
|
|
{ |
|
|
$classGradeModel = new ClassGrade(); |
|
|
$classGradeModel = new ClassGrade(); |
|
|
return $classGradeModel->select()->toArray(); |
|
|
return $classGradeModel->select()->toArray(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public function label_all(){ |
|
|
public function label_all() |
|
|
|
|
|
{ |
|
|
$field = 'label_id, label_name'; |
|
|
$field = 'label_id, label_name'; |
|
|
return (new StudentLabel())->where([['label_id', '>', 0]])->field($field)->order('sort desc,create_time desc')->select()->toArray(); |
|
|
return (new StudentLabel())->where([['label_id', '>', 0]])->field($field)->order('sort desc,create_time desc')->select()->toArray(); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public function getStudentByName($name) |
|
|
|
|
|
{ |
|
|
|
|
|
$query = $this->model->with(['customer_resources'])->where([['name', 'like', '%' . $name . '%']]); |
|
|
|
|
|
$list = $query->select()->toArray(); |
|
|
|
|
|
foreach ($list as &$item) { |
|
|
|
|
|
$item['client_name'] = $item['name'] . '(家长:' . $item['customer_resources']['name'] . ' 电话:' . $item['customer_resources']['phone_number'] . ')'; |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
return $list; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|