Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/master_zhouxudong_59527' into 'master'

Browse Source 
Sprint/master zhouxudong 59527

See merge request easycorp/zentaopms!4326
This commit is contained in:
王怡栋
2022-07-05 02:07:26 +00:00
parent db007fe5eb 6003adcd19
commit a6916a73c5
7 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+6 -6
View File
@@ -3489,10 +3489,10 @@ class taskModel extends model
echo substr($task->openedDate, 5, 11);
break;
case 'estStarted':
echo $task->estStarted;
echo helper::isZeroDate($task->estStarted) ? '' : substr($task->estStarted, 5, 11);
break;
case 'realStarted':
echo substr($task->realStarted, 5, 11);
echo helper::isZeroDate($task->realStarted) ? '' : substr($task->realStarted, 5, 11);
break;
case 'assignedTo':
$this->printAssignedHtml($task, $users);
@@ -3501,25 +3501,25 @@ class taskModel extends model
echo mb_substr($task->lane, 0, 8);
break;
case 'assignedDate':
echo substr($task->assignedDate, 5, 11);
echo helper::isZeroDate($task->assignedDate) ? '' : substr($task->assignedDate, 5, 11);
break;
case 'finishedBy':
echo zget($users, $task->finishedBy);
break;
case 'finishedDate':
echo substr($task->finishedDate, 5, 11);
echo helper::isZeroDate($task->finishedDate) ? '' : substr($task->finishedDate, 5, 11);
break;
case 'canceledBy':
echo zget($users, $task->canceledBy);
break;
case 'canceledDate':
echo substr($task->canceledDate, 5, 11);
echo helper::isZeroDate($task->canceledDate) ? '' : substr($task->canceledDate, 5, 11);
break;
case 'closedBy':
echo zget($users, $task->closedBy);
break;
case 'closedDate':
echo substr($task->closedDate, 5, 11);
echo helper::isZeroDate($task->closedDate) ? '' : substr($task->closedDate, 5, 11);
break;
case 'closedReason':
echo $this->lang->task->reasonList[$task->closedReason];