调接口。。。

webmain/model/flow/meetingModel.php

@@ -8,7 +8,7 @@ class flow_meetingClassModel extends flowModel
     public function initModel()
     {
         $this->hyarra 	= array('正常','会议中','结束','取消');
-        $this->ytarra 	= array('待进行','待进行','进行中','已结束');
+        $this->ytarra 	= array('等待','待进行','进行中','已结束');
         $this->hyarrb 	= array('green','blue','#ff6600','#888888');
         $this->dbobj	= c('date');
 
@@ -115,6 +115,11 @@ class flow_meetingClassModel extends flowModel
                         $data = ['topic_state'=>2];
                         m('meeting_topics')->update($data, "id={$id}");
                     }
+                    if (isset($topics[$i+2]['topic_state'])) {
+                        $id = $topics[$i+2]['id'];
+                        $data = ['topic_state'=>1];
+                        m('meeting_topics')->update($data, "id={$id}");
+                    }
                     break;
                 }
             }

webmain/model/flow/meeting_keyModel.php

@@ -40,7 +40,7 @@ class flow_meeting_keyClassModel extends flowModel
         $stime 	= strtotime($rs['start_time']);
         $etime 	= strtotime($rs['end_time']);
 
-
+        // 会议状态
         if($is_hand != 2){
             if($etime < $time){
                 $nzt = 2;
@@ -60,15 +60,14 @@ class flow_meeting_keyClassModel extends flowModel
         }
 
         // 更新数据状态
-        if($zt != $nzt){
+        if($zt != $nzt) {
             $this->update('meet_state='.$nzt.'', $rs['id']);
             $zt = $nzt;
         }
 
-        // 将id转换为文字
+        // 会议状态-将id转换为文字
         $rs['meet_state'] = m("meeting")->getstatezt($zt);
 
-
         return $rs;
     }
 
@@ -81,15 +80,23 @@ class flow_meeting_keyClassModel extends flowModel
             $topics = $this->db->getall("select * from `[Q]meeting_topics` where mid = {$this->id} order by sort");
 
             for ($i = 0; $i < count($topics); $i++) {
-                if (isset($topics[$i]['topic_state']) && $topics[$i]['topic_state'] == 2) {
+                if ($topics[$i]['topic_state'] == 2) {
                     $id = $topics[$i]['id'];
-                    $data = ['topic_state' => $topics[$i]['topic_state'] + 1];
+                    $data = [
+                        'topic_state' => $topics[$i]['topic_state'] + 1
+                    ];
                     m('meeting_topics')->update($data, "id={$id}");
+                    // 更新下一个状态
                     if (isset($topics[$i + 1]['topic_state'])) {
                         $id = $topics[$i + 1]['id'];
                         $data = ['topic_state' => 2];
                         m('meeting_topics')->update($data, "id={$id}");
                     }
+                    if (isset($topics[$i + 2]['topic_state'])) {
+                        $id = $topics[$i + 2]['id'];
+                        $data = ['topic_state' => 1];
+                        m('meeting_topics')->update($data, "id={$id}");
+                    }
                     break;
                 }
             }
@@ -134,18 +141,19 @@ class flow_meeting_keyClassModel extends flowModel
     }
 
 
-    //子表数据替换处理$lx=0编辑时,1展示时
+    // 子表数据替换处理$lx=0编辑时,1展示时
     protected function flowsubdata($rows, $lx=0){
         if ($lx == 1) {
             m('log')->addlog('编辑', $lx);
             for ($i = 0; $i < count($rows); $i++) {
-                if (isset($rows[$i]['topic_state']) && !empty($rows[$i]['topic_state'])) {
-                    $index = $rows[$i]['topic_state'] ?? 1;
-                    $rows[$i]['topic_state'] = m('meeting')->ytarra[$index];
-                } else {
-//                    $id = $rows[$i]['id'];
-//                    m('meeting_topics')->update(['topic_state'=>1], "id={$id}");
-                }
+                $index = $rows[$i]['topic_state'] ?? 0;
+                $rows[$i]['topic_state'] = m('meeting')->ytarra[$index];
+//                if (isset($rows[$i]['topic_state']) && !empty($rows[$i]['topic_state'])) {
+//                    $rows[$i]['topic_state'] = m('meeting')->ytarra[$index];
+//                } else {
+////                    $id = $rows[$i]['id'];
+////                    m('meeting_topics')->update(['topic_state'=>1], "id={$id}");
+//                }
             }
         }
         return $rows;