diff --git a/application/common/Model/TaskStages.php b/application/common/Model/TaskStages.php index 2b7bacb..4722158 100755 --- a/application/common/Model/TaskStages.php +++ b/application/common/Model/TaskStages.php @@ -36,7 +36,7 @@ class TaskStages extends CommonModel * @throws \think\db\exception\ModelNotFoundException * @throws \think\exception\DbException */ - public function tasks($stageCode, $deleted = 0, $done = -1, $title = '', $pri = [], $executor = [], $creator = [], $joiner = [], $status = [], $endTime = [], $beginTime = [], $createTime = [], $doneTime = []) + public function tasks($stageCode, $deleted = 0, $done = -1, $title = '', $pri = [], $executor = [], $creator = [], $joiner = [], $status = [], $endTime = [], $beginTime = [], $createTime = [], $doneTime = [],$data=[]) { $where = ['pcode' => '', 'deleted' => $deleted]; if ($done != -1) { diff --git a/application/project/controller/TaskStages.php b/application/project/controller/TaskStages.php index 62a8032..12e6ea0 100755 --- a/application/project/controller/TaskStages.php +++ b/application/project/controller/TaskStages.php @@ -66,6 +66,7 @@ class TaskStages extends BasicApi { $where = []; $code = Request::post('stageCode'); + $type = Request::post('type'); $done = Request::param('done', -1); $title = Request::param('title', ''); $pri = json_decode(Request::post('pri', '')); @@ -82,7 +83,8 @@ class TaskStages extends BasicApi $this->error("数据解析异常"); } $where[] = ['stage_code', '=', $code]; - $list = $this->model->tasks($code, 0, $done, $title, $pri, $executor, $creator, $joiner, $status, $endTime, $beginTime, $createTime, $doneTime); + $data[] = ['type'=>$type]; + $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(); $this->success('', $list);