q 1 rok pred
rodič
commit
85d0011a9d

+ 17 - 16
webmain/model/flow/meeting_keyModel.php

@@ -16,22 +16,22 @@ class flow_meeting_keyClassModel extends flowModel
     protected function flowsubmit($na, $sm) {
         if ($na != '编辑') {
             // 提交时初始化为0
-            m('meeting_topics')->update(["topic_state"=>0], 'mid='.$this->id);
-            m('meeting_key')->update(["meet_state"=>1], 'id='.$this->id);
-        }
-        $meet = m('meeting')->getone("id={$this->id}",'start_time');
-
-        if (isset($meet['start_time']) && strtotime($meet['start_time']) > time()) {
-            $topic = m('meeting_topics')->getone("mid={$this->id}",'id, topic_state', 'sort');
-            if (isset($topic['id']) && $topic['topic_state'] < 2) {
-                m('meeting')->firstMeetingTopicStart($this->id);
-            }
-        } else {
-            $topic = m('meeting_topics')->getone("mid={$this->id}",'id, topic_state', 'sort');
-            if (isset($topic['id']) && $topic['topic_state'] < 2) {
-                m('meeting')->update(["meet_state"=>1], "id=".$topic['id']);
-            }
+//            m('meeting_topics')->update(["topic_state"=>0], 'mid='.$this->id);
+//            m('meeting_key')->update(["meet_state"=>1], 'id='.$this->id);
         }
+//        $meet = m('meeting')->getone("id={$this->id}",'start_time');
+//
+//        if (isset($meet['start_time']) && strtotime($meet['start_time']) > time()) {
+//            $topic = m('meeting_topics')->getone("mid={$this->id}",'id, topic_state', 'sort');
+//            if (isset($topic['id']) && $topic['topic_state'] < 2) {
+//                m('meeting')->firstMeetingTopicStart($this->id);
+//            }
+//        } else {
+//            $topic = m('meeting_topics')->getone("mid={$this->id}",'id, topic_state', 'sort');
+//            if (isset($topic['id']) && $topic['topic_state'] < 2) {
+//                m('meeting')->update(["meet_state"=>1], "id=".$topic['id']);
+//            }
+//        }
     }
 
 
@@ -58,8 +58,9 @@ class flow_meeting_keyClassModel extends flowModel
             }
         }
         // 会议开始时的处理
-        if ($stime <= $time && $nzt != 2) {
+        if ($stime <= $time && $etime > $time) {
             $nzt = 1;
+            // 会议开始,议题自动调整开始第一项
             $topic = m('meeting_topics')->getone("mid={$this->id}",'id, topic_state', 'sort');
             if (isset($topic['id']) && $topic['topic_state'] < 2) {
                 m('meeting')->firstMeetingTopicStart($this->id);

+ 1 - 1
webmain/model/meetingModel.php

@@ -7,7 +7,7 @@ class meetingClassModel extends Model
 
     public function initModel()
     {
-        $this->hyarra = array('正常', '会议中', '结束', '取消');
+        $this->hyarra = array('等待中', '会议中', '结束', '取消');
         $this->ytarra = array('等待', '待进行', '进行中', '已结束');
         $this->hyarrb = array('green', 'blue', '#ff6600', '#888888');
     }