Merge branch 'test' of ssh://39.155.253.71:33222/PHP/OA into test

webmain/model/flow/emfkModel.php

@@ -26,9 +26,11 @@ class flow_emfkClassModel extends flowModel
      * @param $sm
      */
     protected function flowcheckafter($zt, $sm){
-        m('log')->addlog('电费付款','未通过');
-        $this->updatestatus(5);
-        if($zt == 2) $this->sendMess(0,9);
+        if($zt == 2){
+            m('log')->addlog('电费付款','未通过');
+            $this->updatestatus(5);
+            $this->sendMess(0,9);
+        }
     }
     /**
      * @param int $messType 动作
@@ -42,8 +44,9 @@ class flow_emfkClassModel extends flowModel
         $url = $url.$key.'&action='.$messType; //接口地址
         $url .= '&numb='.$this->rs['docnum'];
         $url .= '&status='.$status;
-        m('log')->addlog('电费付款','接口返回信息: url '.$url);
         $url .= '&mes='.'';
+        m('log')->addlog('电费付款','接口返回信息: url '.$url);
+
         $res = curlGet($url);
         m('log')->addlog('电费付款','接口返回信息:' .$res);
 

webmain/model/flow/hklistModel.php

 <?php
+
 class flow_hklistClassModel extends flowModel
 {
 
-     
-
-			//审核完成后调用
-	protected function flowcheckafter($zt, $sm){
-	  $flowid=$this->getflow();
-
-	  if($flowid['nowcourseid']== '804'){
-  
-		$data=$this->db->getrows('oa_hks',"mid='".$this->rs['id']."'");
-		foreach ($data as $key => $value) {
-	         $statusarr = array(
-				'status'        =>2,
-				);
-            $id=$value['hks_id'];
-	m('hkrequest')->update($statusarr,"`id`='$id'");
-		}
-	}
-
- if($flowid['nowcourseid']== '807'){
-  
-		$data=$this->db->getrows('oa_hks',"mid='".$this->rs['id']."'");
-		foreach ($data as $key => $value) {
-			if($value['hkstatus']=="已回款"){
-         $statusarr = array(
-			'status'        =>3,
-			);
-            $id=$value['hks_id'];
-	m('hkrequest')->update($statusarr,"`id`='$id'");
-			}
-		}
-	}
-     }
-
- }
+
+    //审核完成后调用
+    protected function flowcheckafter($zt, $sm)
+    {
+        $flowid = $this->getflow();
+
+        if ($flowid['nowcourseid'] == '804') {
+
+            $data = $this->db->getrows('oa_hks', "mid='" . $this->rs['id'] . "'");
+            foreach ($data as $key => $value) {
+                $statusarr = array(
+                    'status' => 2,
+                );
+                $id = $value['hks_id'];
+                m('hkrequest')->update($statusarr, "`id`='$id'");
+            }
+        }
+
+        if ($flowid['nowcourseid'] == '807') {
+
+            $data = $this->db->getrows('oa_hks', "mid='" . $this->rs['id'] . "'");
+            foreach ($data as $key => $value) {
+                if ($value['hkstatus'] == "已回款") {
+                    $statusarr = array(
+                        'status' => 3,
+                    );
+                    $id = $value['hks_id'];
+                    m('hkrequest')->update($statusarr, "`id`='$id'");
+                }
+            }
+        }
+    }
+
+}