|
|
|
@ -44,7 +44,7 @@ class StudentService extends BaseAdminService |
|
|
|
$field = 'id,user_id,campus_id,class_id,name,gender,age,birthday,member_label,emergency_contact,contact_phone,note,status,created_at,updated_at,deleted_at'; |
|
|
|
$order = 'id asc'; |
|
|
|
|
|
|
|
$search_model = $this->model->withSearch(["campus_id","name","emergency_contact","contact_phone","created_at","member_label"], $where)->with(['customerResources','campus','classGrade'])->field($field)->order($order); |
|
|
|
$search_model = $this->model->withSearch(["campus_id", "name", "emergency_contact", "contact_phone", "created_at", "member_label"], $where)->with(['customerResources', 'campus', 'classGrade'])->field($field)->order($order); |
|
|
|
return $this->pageQuery($search_model, function ($item, $key) { |
|
|
|
$item = $this->makeUp($item); |
|
|
|
}); |
|
|
|
@ -59,7 +59,7 @@ class StudentService extends BaseAdminService |
|
|
|
{ |
|
|
|
$field = 'id,user_id,campus_id,class_id,name,gender,age,birthday,emergency_contact,member_label,contact_phone,note,status,created_at,updated_at,deleted_at'; |
|
|
|
|
|
|
|
$info = $this->makeUp($this->model->field($field)->where([['id', "=", $id]])->with(['customerResources','campus','classGrade'])->findOrEmpty()->toArray()); |
|
|
|
$info = $this->makeUp($this->model->field($field)->where([['id', "=", $id]])->with(['customerResources', 'campus', 'classGrade'])->findOrEmpty()->toArray()); |
|
|
|
return $info; |
|
|
|
} |
|
|
|
|
|
|
|
@ -68,9 +68,10 @@ class StudentService extends BaseAdminService |
|
|
|
* 组合整理数据 |
|
|
|
* @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']); |
|
|
|
} |
|
|
|
return $data; |
|
|
|
@ -114,26 +115,40 @@ class StudentService extends BaseAdminService |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public function getCustomerResourcesAll(){ |
|
|
|
$customerResourcesModel = new CustomerResources(); |
|
|
|
return $customerResourcesModel->select()->toArray(); |
|
|
|
public function getCustomerResourcesAll() |
|
|
|
{ |
|
|
|
$customerResourcesModel = new CustomerResources(); |
|
|
|
return $customerResourcesModel->select()->toArray(); |
|
|
|
} |
|
|
|
|
|
|
|
public function getCampusAll(){ |
|
|
|
$campusModel = new Campus(); |
|
|
|
return $campusModel->select()->toArray(); |
|
|
|
public function getCampusAll() |
|
|
|
{ |
|
|
|
$campusModel = new Campus(); |
|
|
|
return $campusModel->select()->toArray(); |
|
|
|
} |
|
|
|
|
|
|
|
public function getClassGradeAll(){ |
|
|
|
$classGradeModel = new ClassGrade(); |
|
|
|
return $classGradeModel->select()->toArray(); |
|
|
|
public function getClassGradeAll() |
|
|
|
{ |
|
|
|
$classGradeModel = new ClassGrade(); |
|
|
|
return $classGradeModel->select()->toArray(); |
|
|
|
} |
|
|
|
|
|
|
|
public function label_all(){ |
|
|
|
public function label_all() |
|
|
|
{ |
|
|
|
$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; |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|