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

更新

Browse Source
This commit is contained in:
mkm 2024-01-15 19:49:25 +08:00
parent b4fa584367
commit 181b2d30cc
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,15 @@ class TaskStages extends CommonModel
if (is_array($stageCode)) { if (is_array($stageCode)) {
$taskModel = $taskModel->whereIn('t.stage_code', $stageCode); $taskModel = $taskModel->whereIn('t.stage_code', $stageCode);
} else { } else {
if (isset($data['type']) && $data['type'] != 'all') if (isset($data['type']) && $data['type'] != 'all'){
$taskModel = $taskModel->where('t.stage_code', $stageCode); $taskModel = $taskModel->where('t.stage_code', $stageCode);
}elseif(isset($data['type']) && $data['type'] == 'all'){
if(isset($data['type_name'])){
$code =Db::name('task_stages')->where('name',$data['type_name'])->where('deleted',0)->column('code');
$taskModel = $taskModel->whereIn('t.stage_code', $code);
}
}
} }
if ($title) { if ($title) {
$taskModel = $taskModel->whereLike('t.name', "%$title%"); $taskModel = $taskModel->whereLike('t.name', "%$title%");

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

@ -67,6 +67,7 @@ class TaskStages extends BasicApi
$where = []; $where = [];
$code = Request::post('stageCode'); $code = Request::post('stageCode');
$type = Request::post('type'); $type = Request::post('type');
$type_name = Request::post('type_name');
$page = Request::post('page',1); $page = Request::post('page',1);
$done = Request::param('done', -1); $done = Request::param('done', -1);
$title = Request::param('title', ''); $title = Request::param('title', '');
@ -85,7 +86,8 @@ class TaskStages extends BasicApi
} }
$where[] = ['stage_code', '=', $code]; $where[] = ['stage_code', '=', $code];
$data = ['type'=>$type]; $data = ['type'=>$type];
$data = ['page'=>$page]; $data['page'] = $page;
$data['type_name'] = $type_name;
$list = $this->model->tasks($code, 0, $done, $title, $pri, $executor, $creator, $joiner, $status, $endTime, $beginTime, $createTime, $doneTime,$data); $list = $this->model->tasks($code, 0, $done, $title, $pri, $executor, $creator, $joiner, $status, $endTime, $beginTime, $createTime, $doneTime,$data);
// $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();