From 591482ad1680f84d31972a9576a63a78682021f1 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Tue, 31 Oct 2023 17:24:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1=E5=B7=A5?= =?UTF-8?q?=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/ProjectTask.php | 107 ++++++++++++++--------------- 1 file changed, 52 insertions(+), 55 deletions(-) diff --git a/app/api/controller/ProjectTask.php b/app/api/controller/ProjectTask.php index e95c5cf..45e626c 100644 --- a/app/api/controller/ProjectTask.php +++ b/app/api/controller/ProjectTask.php @@ -150,64 +150,61 @@ class ProjectTask extends ApiController } else { $this->apiError('删除失败'); } - } public function task_time() { - if (request()->isAjax()) { - $param = get_params(); - $tid = isset($param['tid']) ? $param['tid'] : 0; - $where = []; - if ($tid>0) { - $task_ids = Db::name('ProjectTask')->where(['delete_time' => 0, 'project_id' => $param['tid']])->column('id'); - $where[] = ['a.tid', 'in', $task_ids]; - } - else{ - if (!empty($param['uid'])) { - $where[] = ['a.admin_id', '=', $param['uid']]; - } else { - $where[] = ['a.admin_id', '=', $this->uid]; - } - if (!empty($param['keywords'])) { - $where[] = ['a.title', 'like', '%' . trim($param['keywords']) . '%']; - } - //按时间检索 - if (!empty($param['diff_time'])) { - $diff_time =explode('~', $param['diff_time']); - $where[] = ['a.start_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]]; - } - } - $where[] = ['a.delete_time', '=', 0]; - $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; - $schedule = ScheduleList::where($where) - ->field('a.*,u.name,d.title as department,w.title as work_cate') - ->alias('a') - ->join('Admin u', 'a.admin_id = u.id', 'LEFT') - ->join('Department d', 'u.did = d.id', 'LEFT') - ->join('WorkCate w', 'w.id = a.cid', 'LEFT') - ->order('a.end_time desc') - ->paginate($rows, false) - ->each(function ($item, $key) { - $item->labor_type_string = '案头工作'; - if($item->labor_type == 2){ - $item->labor_type_string = '外勤工作'; - } - if($item->tid > 0){ - $task = Db::name('ProjectTask')->where(['id' => $item->tid])->find(); - $item->task = $task['title']; - $item->project = Db::name('Project')->where(['id' => $task['project_id']])->value('name'); - } - $item->start_time_a = empty($item->start_time) ? '' : date('Y-m-d', $item->start_time); - $item->start_time_b = empty($item->start_time) ? '' : date('H:i', $item->start_time); - $item->end_time_a = empty($item->end_time) ? '' : date('Y-m-d', $item->end_time); - $item->end_time_b = empty($item->end_time) ? '' : date('H:i', $item->end_time); - $item->start_time = empty($item->start_time) ? '' : date('Y-m-d H:i', $item->start_time); - //$item->end_time = empty($item->end_time) ? '': date('Y-m-d H:i', $item->end_time); - $item->end_time = empty($item->end_time) ? '' : date('H:i', $item->end_time); - }); - return table_assign(0, '', $schedule); - } else { - return view(); + $this->checkAuth(); + $this->uid = JWT_UID; + $param = get_params(); + $tid = isset($param['tid']) ? $param['tid'] : 0; + $where = []; + if ($tid>0) { + $task_ids = Db::name('ProjectTask')->where(['delete_time' => 0, 'project_id' => $param['tid']])->column('id'); + $where[] = ['a.tid', 'in', $task_ids]; } + else{ + if (!empty($param['uid'])) { + $where[] = ['a.admin_id', '=', $param['uid']]; + } else { + $where[] = ['a.admin_id', '=', $this->uid]; + } + if (!empty($param['keyword'])) { + $where[] = ['a.title', 'like', '%' . trim($param['keyword']) . '%']; + } + //按时间检索 + if (!empty($param['diff_time'])) { + $diff_time =explode('~', $param['diff_time']); + $where[] = ['a.start_time', 'between', [strtotime(urldecode($diff_time[0])),strtotime(urldecode($diff_time[1]))]]; + } + } + $where[] = ['a.delete_time', '=', 0]; + $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit']; + $schedule = ScheduleList::where($where) + ->field('a.*,u.name,d.title as department,w.title as work_cate') + ->alias('a') + ->join('Admin u', 'a.admin_id = u.id', 'LEFT') + ->join('Department d', 'u.did = d.id', 'LEFT') + ->join('WorkCate w', 'w.id = a.cid', 'LEFT') + ->order('a.end_time desc') + ->paginate($rows, false) + ->each(function ($item, $key) { + $item->labor_type_string = '案头工作'; + if($item->labor_type == 2){ + $item->labor_type_string = '外勤工作'; + } + if($item->tid > 0){ + $task = Db::name('ProjectTask')->where(['id' => $item->tid])->find(); + $item->task = $task['title']; + $item->project = Db::name('Project')->where(['id' => $task['project_id']])->value('name'); + } + $item->start_time_a = empty($item->start_time) ? '' : date('Y-m-d', $item->start_time); + $item->start_time_b = empty($item->start_time) ? '' : date('H:i', $item->start_time); + $item->end_time_a = empty($item->end_time) ? '' : date('Y-m-d', $item->end_time); + $item->end_time_b = empty($item->end_time) ? '' : date('H:i', $item->end_time); + $item->start_time = empty($item->start_time) ? '' : date('Y-m-d H:i', $item->start_time); + $item->end_time = empty($item->end_time) ? '' : date('H:i', $item->end_time); + }); + $this->apiSuccess('删除成功', $schedule); + } }