Parcourir la source

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

NoNZero il y a 9 ans
Parent
commit
55e6b5775b

+ 22 - 9
protected/class/measureauditact.php

@@ -165,8 +165,8 @@ class MeasureauditAct
     public function updateMastatus($maid)
     {
         $this->__measureaudit->mastatus = 'checking';
-        $this->__measureaudit->auditcontent = '';
-        $this->__measureaudit->audittime = '';
+//        $this->__measureaudit->auditcontent = '';
+//        $this->__measureaudit->audittime = '';
         return $this->__measureaudit->update(array('where' => 'maid=?', 'param' => array($maid)));
     }
 
@@ -187,20 +187,33 @@ class MeasureauditAct
         return $this->__measureaudit->update(array('where' => 'maid=?', 'param' => array($maid)));
     }
 
-    public function setStatusTo($maid, $status = 3, $auditcontent = '', $isonline = 0)
+    public function setStatusTo($maid, $status = 3, $auditcontent = null, $isonline = 0)
     {
+        $ma1 = new MeasureAudit();
         if ($status == 3) {
-            $this->__measureaudit->mastatus = 'checked';
+            $ma1->mastatus = 'checked';
         }
         if ($status == 4) {
-            $this->__measureaudit->mastatus = 'checkno';
+            $ma1->mastatus = 'checkno';
         }
         if (isset($auditcontent) && $auditcontent) {
-            $this->__measureaudit->auditcontent = $auditcontent;
+            $ma1->auditcontent = $auditcontent;
         }
-        $this->__measureaudit->audittime = time();
-        $this->__measureaudit->onlineaudit = $isonline;
-        return $this->__measureaudit->update(array('where' => 'maid=?', 'param' => array($maid)));
+        $ma1->audittime = gettimeofday()['sec'];
+        $ma1->onlineaudit = $isonline;
+        return $ma1->update(array('where' => 'maid=?', 'param' => array($maid)));
+    }
+
+    public function setMyAuditPass($maid, $auditcontent = null, $isonline = 0, $uid = 0)
+    {
+        $ma = new MeasureAudit();
+        $ma->mastatus = 'checked';
+        $ma->audittime = gettimeofday()['sec'];
+        if (isset($auditcontent) && $auditcontent) {
+            $ma->auditcontent = $auditcontent;
+        }
+        $ma->onlineaudit = $isonline;
+        return $ma->update(array('where' => 'maid=? and auditoruid=?', 'param' => array($maid, $uid)));
     }
 
     public function getRowInfo($pmid, $numpname, $auditoruid)

+ 2 - 3
protected/controller/RProjectController.php

@@ -338,10 +338,10 @@ class RProjectController extends DooController
             }
         }
         if ($_POST['act'] == 'p') {
-            if ($this->measureauditact->setStatusTo($auditArray['maid'], 3, $_POST['content'], 1)) {
+            if ($this->measureauditact->setMyAuditPass($auditArray['maid'], $_POST['content'], 1, $this->auth->getUid())) {
                 $countAudit = count($auditUserArray);
+                $this->attfile->updateHash($lastRowArray['pmid'], $lastRowArray['numpname'], $maxTimes['times']);
                 if ($auditArray['last'] == 1) {
-                    $this->measureauditact->setStatusTo($auditUserArray[0]['maid'], 3);
                     $this->numofperact->updateAuditStatus($lastRowArray['pmid'], $lastRowArray['numpname'], 'checked', $maxTimes['times']);
                     echo json_encode(array('status' => 1), JSON_UNESCAPED_UNICODE);
                     die();
@@ -367,7 +367,6 @@ class RProjectController extends DooController
                         }
                     }
                 }
-                $this->attfile->updateHash($lastRowArray['pmid'], $lastRowArray['numpname'], $maxTimes['times']);
             }
         }
         if ($_POST['act'] == 'np') {