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

修复：代码失误，时间格式Y-m-d :H:i修改正为Y-m-d H:i

Browse Source
This commit is contained in:
HDM58\hdm58 2023-06-08 17:00:06 +08:00
parent 4e7420877a
commit 00715ff083
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/controller/Index.php
View File

@ -287,7 +287,7 @@ class Index extends BaseController
$check_array = Db::name('FlowRecord')->where(['check_user_id' => $v['id'],'step_id' => $val['id']])->order('check_time desc')->select()->toArray(); $check_array = Db::name('FlowRecord')->where(['check_user_id' => $v['id'],'step_id' => $val['id']])->order('check_time desc')->select()->toArray();
if(!empty($check_array)){ if(!empty($check_array)){
$checked = $check_array[0]; $checked = $check_array[0];
$v['check_time'] = date('Y-m-d :H:i', $checked['check_time']); $v['check_time'] = date('Y-m-d H:i', $checked['check_time']);
$v['content'] = $checked['content']; $v['content'] = $checked['content'];
$v['status'] = $checked['status']; $v['status'] = $checked['status'];
} }
@ -299,7 +299,7 @@ class Index extends BaseController
->join('Admin a', 'a.id = f.check_user_id', 'left') ->join('Admin a', 'a.id = f.check_user_id', 'left')
->where(['f.step_id' => $val['id']])->select()->toArray(); ->where(['f.step_id' => $val['id']])->select()->toArray();
foreach ($check_list as $kk => &$vv) { foreach ($check_list 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', $vv['check_time']);
} }
$val['user_id_info'] = $user_id_info; $val['user_id_info'] = $user_id_info;
@ -319,7 +319,7 @@ class Index extends BaseController
->order('check_time asc') ->order('check_time asc')
->select()->toArray(); ->select()->toArray();
foreach ($check_list as $kk => &$vv) { foreach ($check_list 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', $vv['check_time']);
} }
return to_assign(0, '', $check_list); return to_assign(0, '', $check_list);
} }

2
app/contract/controller/Index.php
View File

@ -283,7 +283,7 @@ class Index extends BaseController
->order('check_time asc') ->order('check_time asc')
->select()->toArray(); ->select()->toArray();
foreach ($check_record as $kk => &$vv) { foreach ($check_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', $vv['check_time']);
$vv['status_str'] = '提交'; $vv['status_str'] = '提交';
if($vv['status'] == 1){ if($vv['status'] == 1){
$vv['status_str'] = '审核通过'; $vv['status_str'] = '审核通过';

2
app/finance/controller/Expense.php
View File

@ -478,7 +478,7 @@ class Expense extends BaseController
->order('check_time desc') ->order('check_time desc')
->select()->toArray(); ->select()->toArray();
foreach ($check_record as $kk => &$vv) { foreach ($check_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', $vv['check_time']);
$vv['status_str'] = '提交'; $vv['status_str'] = '提交';
if($vv['status'] == 1){ if($vv['status'] == 1){
$vv['status_str'] = '审核通过'; $vv['status_str'] = '审核通过';

2
app/finance/controller/Invoice.php
View File

@ -407,7 +407,7 @@ class Invoice extends BaseController
->order('check_time desc') ->order('check_time desc')
->select()->toArray(); ->select()->toArray();
foreach ($check_record as $kk => &$vv) { foreach ($check_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', $vv['check_time']);
$vv['status_str'] = '提交'; $vv['status_str'] = '提交';
if($vv['status'] == 1){ if($vv['status'] == 1){
$vv['status_str'] = '审核通过'; $vv['status_str'] = '审核通过';

6
app/home/controller/Api.php
View File

@ -24,7 +24,7 @@ class api extends BaseController
->limit(8) ->limit(8)
->select()->toArray(); ->select()->toArray();
foreach ($list as $key => $val) { foreach ($list as $key => $val) {
$list[$key]['create_time'] = date('Y-m-d :H:i', $val['create_time']); $list[$key]['create_time'] = date('Y-m-d H:i', $val['create_time']);
} }
$res['data'] = $list; $res['data'] = $list;
return table_assign(0, '', $res); return table_assign(0, '', $res);
@ -46,7 +46,7 @@ class api extends BaseController
->limit(8) ->limit(8)
->select()->toArray(); ->select()->toArray();
foreach ($list as $key => $val) { foreach ($list as $key => $val) {
$list[$key]['create_time'] = date('Y-m-d :H:i', $val['create_time']); $list[$key]['create_time'] = date('Y-m-d H:i', $val['create_time']);
} }
$res['data'] = $list; $res['data'] = $list;
} }
@ -86,7 +86,7 @@ class api extends BaseController
->limit(8) ->limit(8)
->select()->toArray(); ->select()->toArray();
foreach ($list as $key => &$val) { foreach ($list as $key => &$val) {
$val['create_time'] = date('Y-m-d :H:i', $val['create_time']); $val['create_time'] = date('Y-m-d H:i', $val['create_time']);
if($val['end_time']>0){ if($val['end_time']>0){
$val['plan_time'] = date('Y-m-d', $val['start_time']) . ' 至 ' . date('Y-m-d', $val['end_time']); $val['plan_time'] = date('Y-m-d', $val['start_time']) . ' 至 ' . date('Y-m-d', $val['end_time']);
} }

2
app/oa/controller/Approve.php
View File

@ -501,7 +501,7 @@ class Approve extends BaseController
->order('check_time desc') ->order('check_time desc')
->select()->toArray(); ->select()->toArray();
foreach ($check_record as $kk => &$vv) { foreach ($check_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', $vv['check_time']);
$vv['status_str'] = '提交'; $vv['status_str'] = '提交';
if($vv['status'] == 1){ if($vv['status'] == 1){
$vv['status_str'] = '审核通过'; $vv['status_str'] = '审核通过';

2
app/project/controller/Index.php
View File

@ -358,7 +358,7 @@ class Index extends BaseController
->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', $vv['check_time']);
$vv['status_str'] = '提交'; $vv['status_str'] = '提交';
if($vv['status'] == 1){ if($vv['status'] == 1){
$vv['status_str'] = '确认完成'; $vv['status_str'] = '确认完成';