|
@@ -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)
|