更新时间戳
This commit is contained in:
parent
dab1c4b625
commit
1a0bf41555
|
@ -269,6 +269,9 @@ class ProjectIndex extends ApiController
|
||||||
$detail['tasks'] = Db::name('ProjectTask')->where([['project_id', '=', $detail['id']],['delete_time', '=', 0]])->count();
|
$detail['tasks'] = Db::name('ProjectTask')->where([['project_id', '=', $detail['id']],['delete_time', '=', 0]])->count();
|
||||||
$detail['tasks_finish'] = Db::name('ProjectTask')->where([['project_id', '=', $detail['id']],['flow_status', '>', 2], ['delete_time', '=', 0]])->count();
|
$detail['tasks_finish'] = Db::name('ProjectTask')->where([['project_id', '=', $detail['id']],['flow_status', '>', 2], ['delete_time', '=', 0]])->count();
|
||||||
$detail['tasks_unfinish'] = $detail['tasks'] - $detail['tasks_finish'];
|
$detail['tasks_unfinish'] = $detail['tasks'] - $detail['tasks_finish'];
|
||||||
|
$detail['start_time'] = date('Y-m-d H:i:s', $detail['start_time']);
|
||||||
|
$detail['end_time'] = date('Y-m-d H:i:s', $detail['end_time']);
|
||||||
|
$detail['create_time'] = date('Y-m-d H:i:s', $detail['create_time']);
|
||||||
|
|
||||||
//相关附件
|
//相关附件
|
||||||
$file_array = Db::name('ProjectFile')
|
$file_array = Db::name('ProjectFile')
|
||||||
|
@ -313,7 +316,8 @@ class ProjectIndex extends ApiController
|
||||||
->where(array('s.action_id' => $id, 's.type' => 2))
|
->where(array('s.action_id' => $id, 's.type' => 2))
|
||||||
->select()->toArray();
|
->select()->toArray();
|
||||||
foreach ($step_record as $kk => &$vv) {
|
foreach ($step_record as $kk => &$vv) {
|
||||||
$vv['check_time_str'] = date('Y-m-d H:i', $vv['check_time']);
|
$vv['check_time_str'] = date('Y-m-d H:i:s', $vv['check_time']);
|
||||||
|
$vv['check_time'] = date('Y-m-d H:i:s', $vv['check_time']);
|
||||||
$vv['status_str'] = '提交';
|
$vv['status_str'] = '提交';
|
||||||
if($vv['status'] == 1){
|
if($vv['status'] == 1){
|
||||||
$vv['status_str'] = '确认完成';
|
$vv['status_str'] = '确认完成';
|
||||||
|
|
Loading…
Reference in New Issue