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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2019-03-27 13:52:40 +08:00
parent 055340062f 44ffa8ebb6
commit bd0098ef08
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+3 -2
View File
@@ -903,6 +903,7 @@ class projectModel extends model
$burns = $this->dao->select('project, date AS name, `left` AS value')
->from(TABLE_BURN)
->where('project')->in($projectKeys)
->andWhere('task')->eq(0)
->orderBy('date desc')
->fetchGroup('project', 'name');
@@ -1882,7 +1883,7 @@ class projectModel extends model
public function fixFirst($projectID)
{
$project = $this->getById($projectID);
$burn = $this->dao->select('*')->from(TABLE_BURN)->where('project')->eq($projectID)->andWhere('date')->eq($project->begin)->fetch();
$burn = $this->dao->select('*')->from(TABLE_BURN)->where('project')->eq($projectID)->andWhere('task')->eq(0)->andWhere('date')->eq($project->begin)->fetch();
$withLeft = $this->post->withLeft ? $this->post->withLeft : 0;
$data = fixer::input('post')
@@ -1910,7 +1911,7 @@ class projectModel extends model
$project = $this->getById($projectID);
/* If the burnCounts > $itemCounts, get the latest $itemCounts records. */
$sets = $this->dao->select('date AS name, `left` AS value, estimate')->from(TABLE_BURN)->where('project')->eq((int)$projectID)->orderBy('date DESC')->fetchAll('name');
$sets = $this->dao->select('date AS name, `left` AS value, estimate')->from(TABLE_BURN)->where('project')->eq((int)$projectID)->andWhere('task')->eq(0)->orderBy('date DESC')->fetchAll('name');
$count = 0;
$burnData = array();