Explorar o código

会议更换会议室

q hai 1 ano
pai
achega
12f39574df

+ 1 - 1
webmain/flow/input/mode_meetingAction.php

@@ -14,7 +14,7 @@ class mode_meetingClassAction extends inputAction{
 	*/
 	protected function savebefore($table, $arr, $id, $addbo){
 //        if(arrvalue($arr,'type')=='1')return ''; //固定会议不需要判断
-        return m('meeting')->isapplymsg($arr['meeting_time'], $arr['end_time'], $arr['title'], $id);
+        return m('meeting')->isapplymsg($arr['meeting_time'], $arr['end_time'], $arr['meeting_room'], $id);
 	}
 	
 	/**

+ 6 - 6
webmain/model/meetingModel.php

@@ -9,14 +9,14 @@ class meetingClassModel extends Model
     public function isapplymsg($startdt, $enddt, $hyname, $id=0)
     {
         $msg 		= '';
-        $rows 		= $this->getall("id <> '$id' and `type`=0 and `state` in(0,1)");
-        $gdrow		= m('flow')->initflow('meeting')->createmeet(0, substr($startdt,0,10) ,true);//从固定会议中读取
-        foreach($gdrow as $k1=>$rs1)$rows[]=$rs1;
+        $rows 		= $this->getall("id <> '$id' and `state` in(0,1)");
+//        $gdrow		= m('flow')->initflow('meeting')->createmeet(0, substr($startdt,0,10) ,true);//从固定会议中读取
+//        foreach($gdrow as $k1=>$rs1)$rows[]=$rs1;
 
         foreach($rows as $k=>$rs){
-            if($rs['hyname'] != $hyname)continue;
-            $sdt = $rs['startdt'];
-            $edt = $rs['enddt'];
+            if($rs['meeting_room'] != $hyname)continue;
+            $sdt = $rs['meeting_time'];
+            $edt = $rs['end_time'];
             if(
                 ($sdt<=$startdt && $edt>$startdt)
                 || ($sdt<$enddt && $edt>=$enddt)