Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
This commit is contained in:
@@ -1680,9 +1680,9 @@ class executionModel extends model
|
||||
|
||||
$execution->days = $execution->days ? $execution->days : '';
|
||||
$execution->totalHours = $this->dao->select('sum(days * hours) AS totalHours')->from(TABLE_TEAM)->where('root')->eq($execution->id)->andWhere('type')->eq('execution')->fetch('totalHours');
|
||||
$execution->totalEstimate = round($total->totalEstimate, 1);
|
||||
$execution->totalConsumed = round($total->totalConsumed, 1);
|
||||
$execution->totalLeft = round($total->totalLeft - $closedTotalLeft, 1);
|
||||
$execution->totalEstimate = round((float)$total->totalEstimate, 1);
|
||||
$execution->totalConsumed = round((float)$total->totalConsumed, 1);
|
||||
$execution->totalLeft = round((float)($total->totalLeft - $closedTotalLeft), 1);
|
||||
|
||||
$execution = $this->loadModel('file')->replaceImgURL($execution, 'desc');
|
||||
if($setImgSize) $execution->desc = $this->file->setImgSize($execution->desc);
|
||||
|
||||
Reference in New Issue
Block a user