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

任务列表按日期统计

Browse Source
This commit is contained in:
luofei 2023-07-26 17:14:49 +08:00
parent 1ef0586a59
commit 9fcaadc7ba
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/adminapi/controller/TaskController.php
View File

@ -14,7 +14,7 @@ class TaskController extends BaseAdminController
$param['uid'] = $this->adminId;
[$param['page'], $param['limit']] = $this->getPage();
[$count, $list] = (new Task())->list($param);
return $this->success('success', ['count' => $count, 'list' => $list]);
return $this->success('success', ['count' => $count, 'lists' => $list]);
}
public function create()
@ -34,6 +34,7 @@ class TaskController extends BaseAdminController
$param['content'] = $param['ueditorcontent'];
$param['md_content'] = '';
}
$param['start_time'] = strtotime(urldecode($param['start_time']));
if (isset($param['end_time'])) {
$param['end_time'] = strtotime(urldecode($param['end_time']));
$a = $param['end_time'];

20
app/common/model/user/Task.php
View File

@ -88,6 +88,12 @@ class Task extends Model
$where[] = ['flow_status', '=', 2];
}
if (!empty($param['start_time'])) {
$where[] = ['start_time', '>=', strtotime($param['start_time'])];
}
if (!empty($param['end_time'])) {
$where[] = ['end_time', '<=', strtotime($param['end_time']) + 86400];
}
$where[] = ['delete_time', '=', 0];
if ($type == 1) {
unset($where['project_id']);
@ -119,6 +125,7 @@ class Task extends Model
} else {
$item['assist_admin_names'] = implode(',', $assist_admin_names);
}
$item['start_time'] = date('Y-m-d', $item['start_time']);
$item['end_time'] = date('Y-m-d', $item['end_time']);
$item['delay'] = 0;
if ($item['over_time'] > 0 && $item['flow_status'] > 3 && $item['initial_end_time'] < time()) {
@ -131,7 +138,18 @@ class Task extends Model
$item['flow_name'] = self::$FlowStatus[(int)$item['flow_status']];
return $item;
});
return [$count, $list];
$return = [];
if (!empty($param['day']) && !empty($param['start_time']) && !empty($param['end_time'])) {
foreach ($list as $item) {
if (isset($return[$item['start_time']]) && count($return[$item['start_time']]) > 2) {
continue;
}
$return[$item['start_time']][] = $item;
}
} else {
$return = $list;
}
return [$count, $return];
}
//详情