修复图表问题

禅道BUG #750 #787

protected/class/numofperact.php

@@ -254,7 +254,7 @@ class NumofperAct {
 //	return $this->__numofperact->getOne(array('select' => 'sum(currdone) as totalplus', 'where' => 'stid=?', 'param' => array($stid), 'asArray' => TRUE));
 //    }
     public function getCurrdoneSTID($stid) {
-        return $this->__numofperact->getOne(array('select' => 'sum(currdone+currchangeval) as totalplus', 'where' => 'stid=?', 'param' => array($stid), 'asArray' => TRUE));
+        return $this->__numofperact->getOne(array('select' => 'sum(currdone) as totalplus', 'where' => 'stid=?  and currstatus!=\'checkno\'', 'param' => array($stid), 'asArray' => TRUE));
     }
 
     public function getCurrDoneSMontht($stid) {

protected/controller/RProjectController.php

@@ -55,7 +55,7 @@ class RProjectController extends DooController {
                 $this->data['proArray'][$key] = $this->project->getRowByPid($value['pid']);
                 $this->data['proArray'][$key]['contracttotal'] = $this->actmeasure->getTotalWithPid($value['pid']);
                 $this->data['proArray'][$key]['changTotal'] = $this->numofperact->getChangTotal($value['pid']);
-                $this->data['proArray'][$key]['contracttotal'] += $this->data['proArray'][$key]['changTotal'];
+//                $this->data['proArray'][$key]['contracttotal'] += $this->data['proArray'][$key]['changTotal'];
                 $this->data['proArray'][$key]['currdone'] = $this->numofperact->getCurrDoneNow($value['pid']);
                 if (($this->data['proArray'][$key]['contracttotal'] > 0) && ($this->data['proArray'][$key]['currdone'] > 0)) {
                     $this->data['proArray'][$key]['pcurrdone'] = round(($this->data['proArray'][$key]['currdone'] / $this->data['proArray'][$key]['contracttotal']) * 100) . '%';