计量支付

在线审批
操作审批时,在线审批需要变更附件hashcode,软件才可以更新下载
在线审批操作会同时操作此次审批标段的所有审核人的的时间和内容

protected/class/measureauditact.php

@@ -157,6 +157,12 @@ class MeasureauditAct
         return $this->__measureaudit->getOne(array('where' => 'pmid=? AND numpname=? AND times=? AND auditoruid=?', 'param' => array($pmid, $numpname, $times, $uid), 'asArray' => TRUE));
     }
 
+    public function getMyAuditStatus2($pmid, $numpname, $times, $uid)
+    {
+        return $this->__measureaudit->getOne(array('where' => 'pmid=? AND numpname=? AND times=? AND auditoruid=?', 'param' => array($pmid, $numpname, $times, $uid),'asc'=>'maid', 'asArray' => TRUE));
+    }
+
+
     public function getFirstAuditor($pmid, $numpname, $times = 0)
     {
         return $this->__measureaudit->getOne(array('where' => 'maid =(select min(maid) from jl_measure_audit where `pmid`=? and `numpname` =? and times=? and last=2)', 'param' => array($pmid, $numpname, $times), 'asArray' => TRUE));

protected/class/numofperact.php

@@ -149,6 +149,10 @@ class NumofperAct {
         return $this->__numofperact->find(array('where' => 'pmid=? and currstatus!=\'checkno\'', 'groupby' => 'numpname', 'desc' => 'numpname,times', 'param' => array($pmid), 'asArray' => TRUE));
     }
 
+    public function getGroupByLastOne2($pmid) {
+        return $this->__numofperact->find(array('where' => 'pmid=?', 'groupby' => 'numpname', 'desc' => 'numpname,times', 'param' => array($pmid), 'asArray' => TRUE));
+    }
+
     public function getRowByPmid2($pmid) {
         return $this->__numofperact->find(array('where' => 'pmid=?', 'param' => array($pmid), 'asArray' => TRUE));
     }
@@ -202,7 +206,11 @@ class NumofperAct {
     }
 
     public function getLastStatus2($pid, $pmid) {
-        return $this->__numofperact->getOne(array('where' => 'pid=? and pmid=?', 'groupby' => 'pmid,numpname', 'desc' => 'times', 'param' => array($pid, $pmid), 'asArray' => TRUE));
+        return $this->__numofperact->getOne(array('where' => 'pid=? and pmid=?', 'groupby' => 'pmid,numpname,times', 'desc' => 'times', 'param' => array($pid, $pmid), 'asArray' => TRUE));
+    }
+
+    public function getLastStatus3($pid, $pmid) {
+        return $this->__numofperact->getOne(array('where' => 'pid=? and pmid=?', 'desc' => 'numpname', 'param' => array($pid, $pmid), 'asArray' => TRUE));
     }
 
     public function getChangTotal($pid) {

protected/controller/RProjectController.php

@@ -35,6 +35,7 @@ class RProjectController extends DooController
         $this->data['user'] = $this->profile->getProWithUid($this->auth->getUid());
         $mpidArray = $this->measureauditact->getAuditProject2($this->auth->getUid());
         if (isset($mpidArray[0]['pid'])) {
+            $this->data['numofchecking'] = 0;
             foreach ($mpidArray as $key => $value) {
                 // 审批操作按照时间排序多标段
                 $this->data['numofchecking'] += $this->measureauditact->getCountMyChecking($value['pid'], $this->auth->getUid());
@@ -102,7 +103,7 @@ class RProjectController extends DooController
 
     public function proSection()
     {
-        $mpidArray = $this->measureauditact->getAuditProject($this->auth->getUid());
+        $mpidArray = $this->measureauditact->getAuditProject2($this->auth->getUid());
         foreach ($mpidArray as $k1 => $v1) {
             if ($v1['pid'] != $this->params['pid'])
                 $this->data['allproArray'][] = $this->project->getRowByPid($v1['pid']);
@@ -122,7 +123,7 @@ class RProjectController extends DooController
             $ncurrdone = number_format(0, 2, '.', ',');
             $pnowtotal = '0%';
             $dispcurrdone = '0%';
-            $numStatusArray['currstatus'] = 'uncheck';
+//            $numStatusArray['currstatus'] = 'uncheck';
             $StidArray = $this->actmeasure->getAllbyStid($value['stid']);
             $currdoneInt = $this->numofperact->getCurrdoneSTID($value['stid'])['totalplus'];
             if (isset($StidArray))
@@ -145,11 +146,11 @@ class RProjectController extends DooController
                         if (!isset($countNum)) {
                             $countNum = 0;
                         }
-                        $numStatusArray = $this->numofperact->getLastStatus($this->params['pid'], $v['pmid']);
+                        $numStatusArray = $this->numofperact->getLastStatus3($this->params['pid'], $v['pmid']);
                         if (!isset($numStatusArray['currstatus'])) {
                             $numStatusArray['currstatus'] = 'uncheck';
                         }
-                        $datatmp = $this->measureauditact->getMyAuditStatus($numStatusArray['pmid'], $numStatusArray['numpname'], $numStatusArray['times'], $this->auth->getUid());
+                        $datatmp = $this->measureauditact->getMyAuditStatus2($numStatusArray['pmid'], $numStatusArray['numpname'], $numStatusArray['times'], $this->auth->getUid());
                         if ($datatmp && ($datatmp['mastatus'] == 'checking')) {
                             $buttonhtml = '<a class="btn btn-warning btn-small" href="/rproject/' . $this->params['pid'] . '/section/' . $v['pmid'] . '/report/' . $numStatusArray['mpid'] . '">开始审批</a>';
                         } else {
@@ -273,16 +274,15 @@ class RProjectController extends DooController
 
     public function proDetail()
     {
-        $numStatusArray = $this->numofperact->getLastStatus($this->params['pid'], $this->params['pmid']);
+        $numStatusArray = $this->numofperact->getLastStatus2($this->params['pid'], $this->params['pmid']);
         // 项目名称
-        $mpidArray = $this->measureauditact->getAuditProject($this->auth->getUid());
+        $mpidArray = $this->measureauditact->getAuditProject2($this->auth->getUid());
         foreach ($mpidArray as $k1 => $v1) {
             if ($v1['pid'] != $this->params['pid'])
                 $this->data['allproArray'][] = $this->project->getRowByPid($v1['pid']);
         }
         $this->data['currproArray'] = $this->project->getRowByPid($this->params['pid']);
         $this->data['MeasureArray'] = $this->numofperact->getGroupByLastOne($this->params['pmid']);
-        $this->data['MeasureArray'] = $this->numofperact->getGroupByLastOne($this->params['pmid']);
         $measureArray = $this->actmeasure->getRowByPmid($this->params['pmid']);
         foreach ($this->data['MeasureArray'] as $key => $value) {
             if ($measureArray['contracttotal'] > ($value['currdone'] > 0)) {
@@ -303,7 +303,7 @@ class RProjectController extends DooController
 
 
         // 期数列表
-        $tmpArray = $this->numofperact->getGroupByLastOne($this->params['pmid']);
+        $tmpArray = $this->numofperact->getGroupByLastOne2($this->params['pmid']);
         foreach ($tmpArray as $k => $v) {
             if ($v['mpid'] == $this->params['mpid']) {
                 $this->data['currnum'] = $v['numpname'];
@@ -390,7 +390,7 @@ class RProjectController extends DooController
             if ($value['mastatus'] == 'uncheck') {
                 $statuStr = '';
                 $statucolorStr = '';
-                $statushtml = '<li title="" class=""><img src="' . Doo::conf()->APP_URL . 'global/images/avtra.png"></li>';
+                $statushtml = '<li title="" class=""><img src="' . $strAvatar . '"></li>';
             }
             if ($value['mastatus'] == 'checking') {
                 $statuStr = '<h4 class="colOrange">审核中</h4>';