调接口。。。

webmain/model/flow/meeting_keyModel.php

@@ -13,11 +13,15 @@ class flow_meeting_keyClassModel extends flowModel
     }
 
     //提交时调用
-    protected function flowsubmit($na, $sm){
-        m('meeting_topics')->update(["topic_state"=>1], '1=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);
+    protected function flowsubmit($na, $sm) {
+        if ($na == '编辑') {
+
+        } else {
+            m('meeting_topics')->update(["topic_state"=>0], '1=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);
+            }
         }
     }
 

webmain/model/meetingModel.php

@@ -8,7 +8,7 @@ class meetingClassModel extends Model
     public function initModel()
     {
         $this->hyarra = array('正常', '会议中', '结束', '取消');
-        $this->ytarra = array('待进行', '待进行', '进行中', '已结束');
+        $this->ytarra = array('等待', '待进行', '进行中', '已结束');
         $this->hyarrb = array('green', 'blue', '#ff6600', '#888888');
     }
 
@@ -56,9 +56,12 @@ class meetingClassModel extends Model
 
     public function firstMeetingTopicStart($meeting_id) {
 
-        $topic = m('meeting_topics')->getone("mid={$meeting_id}", "id", 'sort');
-        if (isset($topic['id'])) {
-            m('meeting_topics')->update(['topic_state'=>'2'], 'id='.$topic['id']);
+        $topic = m('meeting_topics')->getall("mid={$meeting_id}", "id", 'sort');
+        if (isset($topic[0]['id'])) {
+            m('meeting_topics')->update(['topic_state'=>'2'], 'id='.$topic[0]['id']);
+        }
+        if (isset($topic[1]['id'])) {
+            m('meeting_topics')->update(['topic_state'=>'1'], 'id='.$topic[1]['id']);
         }
     }
 

webmain/task/openapi/openmeetAction.php

@@ -118,18 +118,18 @@ class openmeetClassAction extends openapiAction
                 // 会议议题处理
                 for ($i = 0; $i < count($topics); $i++) {
                     $info = $topics[$i];
-                    $data['meetingTopic'][$i]['state'] = $info['topic_state'] - 1;
+                    $data['meetingTopic'][$i]['state'] = $info['topic_state'];
                     $data['meetingTopic'][$i]['tip'] = m("meeting")->ytarra[$info['topic_state']];
                     $data['meetingTopic'][$i]['text'] = $info['topic_title'];
                     if ($info['topic_state'] == 2) {
                         $data['participants'][] = [
                             "topics" => $info['topic_title'],
-                            "personnel_list" => $info['topic_info'],
+                            "personnel_list" => str_replace("\n", "<br />", $info['topic_info']),
                         ];
                         if (isset($topics[$i + 1])) {
                             $data['participants'][] = [
                                 "topics" => $topics[$i + 1]['topic_title'],
-                                "personnel_list" => $topics[$i + 1]['topic_info'],
+                                "personnel_list" => str_replace("\n", "<br />", $topics[$i + 1]['topic_info']),
                             ];
                         }
                     }