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

* Fix program and project module.

Browse Source
This commit is contained in:
zhujinyong
2021-03-04 13:57:44 +08:00
parent 14c36ca740
commit 6adbb10ac4
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/model.php
-30
View File
@@ -875,34 +875,4 @@ class programModel extends model
}
return $stats;
}
/**
* Get project team member pairs.
*
* @param int $programID
* @access public
* @return array
*/
public function getProjectTeamMemberPairs($programID = 0)
{
$projectList = $this->getPRJPairs($programID);
if(!$projectList) return array('' => '');
$users = $this->dao->select("t2.id, t2.account, t2.realname")->from(TABLE_TEAM)->alias('t1')
->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
->where('t1.root')->in(array_keys($projectList))
->andWhere('t1.type')->eq('project')
->andWhere('t2.deleted')->eq(0)
->fetchAll('account');
if(!$users) return array('' => '');
foreach($users as $account => $user)
{
$firstLetter = ucfirst(substr($user->account, 0, 1)) . ':';
if(!empty($this->config->isINT)) $firstLetter = '';
$users[$account] = $firstLetter . ($user->realname ? $user->realname : $user->account);
}
return array('' => '') + $users;
}
}
module/project/model.php
+34 -4
View File
@@ -390,19 +390,49 @@ class projectModel extends model
}
/**
* Get project pairs.
* Get project team member pairs.
*
* @param int $projectID
* @param int $programID
* @access public
* @return array
*/
public function getTeamMemberPairs($programID = 0)
{
$projectList = $this->getPairsByProgram($programID);
if(!$projectList) return array('' => '');
$users = $this->dao->select("t2.id, t2.account, t2.realname")->from(TABLE_TEAM)->alias('t1')
->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
->where('t1.root')->in(array_keys($projectList))
->andWhere('t1.type')->eq('project')
->andWhere('t2.deleted')->eq(0)
->fetchAll('account');
if(!$users) return array('' => '');
foreach($users as $account => $user)
{
$firstLetter = ucfirst(substr($user->account, 0, 1)) . ':';
if(!empty($this->config->isINT)) $firstLetter = '';
$users[$account] = $firstLetter . ($user->realname ? $user->realname : $user->account);
}
return array('' => '') + $users;
}
/**
* Get project pairs by programID.
*
* @param int $programID
* @param status $status all|wait|doing|suspended|closed|noclosed
* @access public
* @return object
*/
public function getPairs($projectID = 0, $status = 'all')
public function getPairsByProgram($programID = 0, $status = 'all')
{
return $this->dao->select('id, name')->from(TABLE_PROJECT)
->where('type')->eq('project')
->andWhere('deleted')->eq(0)
->beginIF($projectID)->andWhere('parent')->eq($projectID)->fi()
->beginIF($programID)->andWhere('parent')->eq($programID)->fi()
->beginIF($status != 'all' && $status != 'noclosed')->andWhere('status')->eq($status)->fi()
->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()