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

* Task#3574

Browse Source
This commit is contained in:
滔哥
2017-12-29 17:27:58 +08:00
parent 345178901a
commit 0d5b43fb5c
6 changed files with 63 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/report/model.php
+5 -2
View File
@@ -238,10 +238,13 @@ class reportModel extends model
/**
* Get workload.
*
* @param int $dept
* @param int $assign
*
* @access public
* @return array
*/
public function getWorkload($dept = 0)
public function getWorkload($dept = 0, $assign = 1)
{
$depts = array();
if($dept) $depts = $this->loadModel('dept')->getAllChildId($dept);
@@ -265,7 +268,7 @@ class reportModel extends model
$workload[$user]['task'][$task->projectName]['count'] = isset($workload[$user]['task'][$task->projectName]['count']) ? $workload[$user]['task'][$task->projectName]['count'] + 1 : 1;
$workload[$user]['task'][$task->projectName]['manhour'] = isset($workload[$user]['task'][$task->projectName]['manhour']) ? $workload[$user]['task'][$task->projectName]['manhour'] + $task->left : $task->left;
$workload[$user]['task'][$task->projectName]['projectID'] = $task->project;
$workload[$user]['total']['count'] = isset($workload[$user]['total']['count']) ? $workload[$user]['total']['count'] + 1 : 1;
$workload[$user]['total']['count'] = isset($workload[$user]['total']['count']) ? $workload[$user]['total']['count'] + 1 : 1;
if($task->parent == 0) $workload[$user]['total']['manhour'] = isset($workload[$user]['total']['manhour']) ? $workload[$user]['total']['manhour'] + $task->left : $task->left;
}
}