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 2019-03-07 13:47:20 +08:00
parent d413c08368
commit 3b60c3faed
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/common/Model/Task.php
View File

@ -293,6 +293,7 @@ class Task extends CommonModel
Db::rollback(); Db::rollback();
throw new \Exception($e->getMessage()); throw new \Exception($e->getMessage());
} }
unset($result['id']);
return $result; return $result;
} }

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

@ -24,9 +24,13 @@ 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) public function tasks($stageCode, $deleted = 0, $done = -1)
{ {
$list = Task::where(['stage_code' => $stageCode, 'pcode' => '', 'deleted' => $deleted])->order('sort asc,id asc')->field('id', true)->select(); $where = ['stage_code' => $stageCode, 'pcode' => '', 'deleted' => $deleted];
if ($done != -1) {
$where['done'] = $done;
}
$list = Task::where($where)->order('sort asc,id asc')->field('id', true)->select();
if ($list) { if ($list) {
foreach ($list as &$task) { foreach ($list as &$task) {
$task['executor'] = Member::where(['code' => $task['assign_to']])->field('name,avatar')->find(); $task['executor'] = Member::where(['code' => $task['assign_to']])->field('name,avatar')->find();

2
application/project/controller/Task.php
View File

@ -153,7 +153,7 @@ class Task extends BasicApi
$this->error($e->getMessage(), $e->getCode());; $this->error($e->getMessage(), $e->getCode());;
} }
if ($result) { if ($result) {
$this->success(); $this->success('', $result);
} }
$this->error("操作失败，请稍候再试！"); $this->error("操作失败，请稍候再试！");
} }

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

@ -38,6 +38,8 @@ class TaskStages extends BasicApi
$item['fixedCreator'] = false; //添加任务按钮定位 $item['fixedCreator'] = false; //添加任务按钮定位
$item['showTaskCard'] = false; //是否显示创建卡片 $item['showTaskCard'] = false; //是否显示创建卡片
$item['tasks'] = []; $item['tasks'] = [];
$item['doneTasks'] = [];
$item['unDoneTasks'] = [];
} }
} }
$this->success('', $list); $this->success('', $list);
@ -52,11 +54,12 @@ class TaskStages extends BasicApi
{ {
$where = []; $where = [];
$code = Request::post('stageCode'); $code = Request::post('stageCode');
$done = Request::param('done', -1);
if (!$code) { if (!$code) {
$this->error("数据解析异常"); $this->error("数据解析异常");
} }
$where[] = ['stage_code', '=', $code]; $where[] = ['stage_code', '=', $code];
$list = $this->model->tasks($code); $list = $this->model->tasks($code, 0, $done);
// $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);