mkm/work
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加任务执行状态

Browse Source 
Signed-off-by: vilson <545522390@qq.com>
This commit is contained in:
vilson 2020-03-04 10:42:51 +08:00
parent 893449ab6c
commit cec4cf5024
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
application/common/Model/TaskStages.php
View File

@ -34,7 +34,7 @@ class TaskStages extends CommonModel
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function tasks($stageCode, $deleted = 0, $done = -1, $title = '', $pri = [], $executor = [], $creator = [], $joiner = [], $endTime = [], $beginTime = [], $createTime = [], $doneTime = []) public function tasks($stageCode, $deleted = 0, $done = -1, $title = '', $pri = [], $executor = [], $creator = [], $joiner = [], $status = [], $endTime = [], $beginTime = [], $createTime = [], $doneTime = [])
{ {
$where = ['pcode' => '', 'deleted' => $deleted]; $where = ['pcode' => '', 'deleted' => $deleted];
if ($done != -1) { if ($done != -1) {
@ -43,7 +43,7 @@ class TaskStages extends CommonModel
$taskModel = Task::alias('t')->where($where); $taskModel = Task::alias('t')->where($where);
if (is_array($stageCode)) { if (is_array($stageCode)) {
$taskModel = $taskModel->whereIn('t.stage_code', $stageCode); $taskModel = $taskModel->whereIn('t.stage_code', $stageCode);
}else{ } else {
$taskModel = $taskModel->where('t.stage_code', $stageCode); $taskModel = $taskModel->where('t.stage_code', $stageCode);
} }
if ($title) { if ($title) {
@ -52,6 +52,9 @@ class TaskStages extends CommonModel
if ($pri) { if ($pri) {
$taskModel = $taskModel->whereIn('t.pri', $pri); $taskModel = $taskModel->whereIn('t.pri', $pri);
} }
if ($status) {
$taskModel = $taskModel->whereIn('t.status', $status);
}
if ($endTime) { if ($endTime) {
$taskModel = $taskModel->whereBetween('t.end_time', implode(',', $endTime)); $taskModel = $taskModel->whereBetween('t.end_time', implode(',', $endTime));
} }
@ -62,7 +65,7 @@ class TaskStages extends CommonModel
$taskModel = $taskModel->whereBetween('t.create_time', implode(',', $createTime)); $taskModel = $taskModel->whereBetween('t.create_time', implode(',', $createTime));
} }
if ($doneTime) { if ($doneTime) {
$taskModel = $taskModel->leftJoin('project_log pl', 't.code = pl.source_code')->where(['pl.action_type'=> 'task', 'pl.type' => 'done'])->whereBetween('pl.create_time', $doneTime); $taskModel = $taskModel->leftJoin('project_log pl', 't.code = pl.source_code')->where(['pl.action_type' => 'task', 'pl.type' => 'done'])->whereBetween('pl.create_time', $doneTime);
} }
//todo 查询范围问题 //todo 查询范围问题
$joinTaskMember = false; $joinTaskMember = false;

3
application/project/controller/TaskStages.php
View File

@ -69,6 +69,7 @@ class TaskStages extends BasicApi
$done = Request::param('done', -1); $done = Request::param('done', -1);
$title = Request::param('title', ''); $title = Request::param('title', '');
$pri = json_decode(Request::post('pri', '')); $pri = json_decode(Request::post('pri', ''));
$status = json_decode(Request::post('status', ''));
$stage = json_decode(Request::post('stage', '')); $stage = json_decode(Request::post('stage', ''));
$executor = json_decode(Request::post('executor', '')); $executor = json_decode(Request::post('executor', ''));
$creator = json_decode(Request::post('creator', '')); $creator = json_decode(Request::post('creator', ''));
@ -81,7 +82,7 @@ class TaskStages extends BasicApi
$this->error("数据解析异常"); $this->error("数据解析异常");
} }
$where[] = ['stage_code', '=', $code]; $where[] = ['stage_code', '=', $code];
$list = $this->model->tasks($code, 0, $done, $title, $pri, $executor, $creator, $joiner, $endTime, $beginTime, $createTime, $doneTime); $list = $this->model->tasks($code, 0, $done, $title, $pri, $executor, $creator, $joiner, $status, $endTime, $beginTime, $createTime, $doneTime);
// $list = \app\common\Model\Task::alias('t')->join('member m','t.assign_to = m.code')->field()->where(['stage_code'=>$code])->select(); // $list = \app\common\Model\Task::alias('t')->join('member m','t.assign_to = m.code')->field()->where(['stage_code'=>$code])->select();
$this->success('', $list); $this->success('', $list);