|
|
@@ -15,7 +15,7 @@ class AppointmentApplication extends Permissions
|
|
|
public function index()
|
|
|
{
|
|
|
if ($this->request->isAjax()) {
|
|
|
- $post = $this->request->param();
|
|
|
+ $post = $this->request->param();
|
|
|
$where = [];
|
|
|
if (isset($post['ids']) and !empty($post['ids'])) {
|
|
|
$where['id'] = ['in', $post['ids']];
|
|
|
@@ -39,34 +39,35 @@ class AppointmentApplication extends Permissions
|
|
|
$where["remark"] = ['like', '%' . $post["remark"] . '%'];
|
|
|
}
|
|
|
if (isset($post["create_time"]) and !empty($post["create_time"])) {
|
|
|
- $timerang = explode(' - ', $post["create_time"]);
|
|
|
- $min_time = strtotime($timerang[0]);
|
|
|
- $max_time = $timerang[0] == $timerang[1] ? $min_time + 24 * 3600 - 1 : strtotime($timerang[1]??'');
|
|
|
+ $timerang = explode(' - ', $post["create_time"]);
|
|
|
+ $min_time = strtotime($timerang[0]);
|
|
|
+ $max_time = $timerang[0] == $timerang[1] ? $min_time + 24 * 3600 - 1 : strtotime($timerang[1] ?? '');
|
|
|
$where["create_time"] = [['>=', $min_time], ['<=', $max_time]];
|
|
|
}
|
|
|
if (isset($post["finish_time"]) and !empty($post["finish_time"])) {
|
|
|
- $timerang = explode(' - ', $post["finish_time"]);
|
|
|
- $min_time = strtotime($timerang[0]);
|
|
|
- $max_time = $timerang[0] == $timerang[1] ? $min_time + 24 * 3600 - 1 : strtotime($timerang[1]??'');
|
|
|
+ $timerang = explode(' - ', $post["finish_time"]);
|
|
|
+ $min_time = strtotime($timerang[0]);
|
|
|
+ $max_time = $timerang[0] == $timerang[1] ? $min_time + 24 * 3600 - 1 : strtotime($timerang[1] ?? '');
|
|
|
$where["finish_time"] = [['>=', $min_time], ['<=', $max_time]];
|
|
|
}
|
|
|
|
|
|
$model = $this->getModel();
|
|
|
$count = $model->where($where)->count();
|
|
|
- $data = $model->with('ticket')->where($where)->page($post['page']??0, $post['limit']??15)->order('id desc')->select();
|
|
|
+ $data = $model->with('ticket')->where($where)->page($post['page'] ?? 0, $post['limit'] ?? 15)->order('id desc')->select();
|
|
|
foreach ($data as $key => $value) {
|
|
|
- $value['childs_text'] = $value->childs_text;
|
|
|
- $value['sex_text'] = $value->sex_text;
|
|
|
- $value['status_text'] = $value->status_text;
|
|
|
- $value['problem_type_text'] = $value->problem_type_text;
|
|
|
- $value['marriage_text'] = $value->marriage_text;
|
|
|
+ $value['childs_text'] = $value->childs_text;
|
|
|
+ $value['sex_text'] = $value->sex_text;
|
|
|
+ $value['status_text'] = $value->status_text;
|
|
|
+ $value['problem_type_text'] = $value->problem_type_text;
|
|
|
+ $value['marriage_text'] = $value->marriage_text;
|
|
|
$value['education_level_text'] = $value->education_level_text;
|
|
|
- $value['appointment_date'] = $value->appointment_date;
|
|
|
+ $value['appointment_date'] = $value->appointment_date;
|
|
|
$value['education_level_text'] = $value->education_level_text;
|
|
|
- $value['ticke_time'] = empty($value->ticket) ? '' : $value->ticket->appointment_daytime;
|
|
|
- $data[$key] = $value;
|
|
|
+ $value['ticke_time'] = empty($value->ticket) ? '' : $value->ticket->appointment_daytime;
|
|
|
+ $value['address_name'] = $value->address ? $value->address->title : '';
|
|
|
+ $data[$key] = $value;
|
|
|
}
|
|
|
- return array('code' => 0, 'count' => $count, 'data' => $data);
|
|
|
+ return ['code' => 0, 'count' => $count, 'data' => $data];
|
|
|
} else {
|
|
|
return $this->fetch();
|
|
|
}
|
|
|
@@ -75,9 +76,9 @@ class AppointmentApplication extends Permissions
|
|
|
|
|
|
public function publish()
|
|
|
{
|
|
|
- $id = $this->request->param('id', 0, 'intval');
|
|
|
+ $id = $this->request->param('id', 0, 'intval');
|
|
|
$model = $this->getModel();
|
|
|
- $post = $this->request->post();
|
|
|
+ $post = $this->request->post();
|
|
|
if ($this->request->isPost()) {
|
|
|
//验证
|
|
|
$validate = new \think\Validate([
|
