会议列表提示信息

webmain/model/flow/meetingModel.php

@@ -108,65 +108,23 @@ class flow_meetingClassModel extends flowModel
     // $ors当前单据操作信息，$crs提交过来的信息
     public function flowoptmenu($ors, $crs)
     {
-        // 切换会议议题
-        if ($ors['num'] == 'changeTopic') {
-            $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) {
-                    $id = $topics[$i]['id'];
-                    $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;
-                }
-            }
-
-            if (isset($topics[count($topics) - 1]) && $topics[count($topics) - 1]['topic_state'] == 2) {
-                m('meeting')->update(['is_hand'=>1,'meet_state'=>2], "id={$this->id}");
-            }
-
-        } else if ($ors['num'] == 'enableMeeting') {
-
-            $time 	= time();
+        if ($ors['num'] == 'enableMeeting') {
+            // 开始会议
+            $data = [
+                'meet_state'=>1,
+                'is_hand'=>1
+            ];
 
-            $stime 	= strtotime($this->rs['start_time']);
-            $etime 	= strtotime($this->rs['end_time']);
-
-            if ($stime < $time){
-                $data = [
-                    'meet_state'=>1,
-                    'is_hand'=>1
-                ];
-            } else if ($stime >= $time) {
-                $data = [
-                    'meet_state'=>0,
-                    'is_hand'=>1
-                ];
-            }
             m('meeting')->update($data, "id={$this->id}");
 
-            $topic = m('meeting_topics')->getone("mid={$this->id}", "id", 'sort desc');
-            if (isset($topic['id'])) {
-                m('meeting_topics')->update(['topic_state'=>'2'], 'id='.$topic['id']);
-            }
-        } else if ($ors['num'] == 'disenableMeeting') {
+        } else if ($ors['num'] == 'noup_end_meet') {
+            // 手动结束会议
+            $data = [
+                'meet_state'=>2,
+                'is_hand'=>1
+            ];
+            m('meeting')->update($data, "id={$this->id}");
 
-//            $data = [
-//                'meet_state'=>2,
-//                'is_hand'=>1
-//            ];
-//
-//            m('meeting_key')->update($data, "id={$this->id}");
         } else if ($ors['num'] == "noup_chage_room") {
             $data = $this->rs;
             $roomName = $this->meeting_room[$data['room_id']]['room_name'];
@@ -178,7 +136,7 @@ class flow_meetingClassModel extends flowModel
                 ], "id={$this->id}");
 
                 // 更换会议室 - 发送会议短信
-                $this->meetingSuccSms($this->id);
+//                $this->meetingSuccSms($this->id);
             } else {
                 return $isApply;
             }
@@ -240,6 +198,12 @@ class flow_meetingClassModel extends flowModel
 
     }
 
+    //单据判断条件从写$lx类型，$uid用户Id
+    protected function flowbillwhere($lx, $uid){
+        return [
+            'order'=>'start_time desc'
+        ];
+    }
     // 自定义方法
 
     // 状态样式
@@ -406,15 +370,17 @@ class flow_meetingClassModel extends flowModel
         $meets = $this->getall('fixed=1');
         for ($i = 0; $i < count($meets); $i++) {
             $meet = $meets[$i];
+            $date = date('Y-m-d', strtotime('+1 day'));
             $id = $meet['id'];
             $st = $meet['start_time'];
             $et = $meet['end_time'];
-            $st = date("Y-m-d").' '.substr($st, 11);
-            $et = date("Y-m-d").' '.substr($et, 11);
+            $st = $date.' '.substr($st, 11);
+            $et = $date.' '.substr($et, 11);
             m('meeting')->update([
                 'start_time'=>$st,
                 'end_time'=>$et,
-                'meet_state' => 0
+                'meet_state' => 0,
+                'is_hand' => 0
             ], "id={$id}");
         }
     }

webmain/task/runt/dayAction.php

@@ -38,10 +38,32 @@ class dayClassAction extends runtAction
 		//车辆提醒
 		if($this->moderock('carms'))m('flow')->initflow('carms')->todocarms('');
 
+	}
+
+    // 每天凌晨执行
+    public function earlyMorningAction()
+    {
+
+    }
+
+    // 早晨执行
+    public function morningAction()
+    {
+
+    }
+
+    // 中午执行
+    public function noonAction()
+    {
         //固定会议
-//        if($this->moderock('meeting_key'))m('flow')->initflow('meeting_key')->fixedMeetings('');
         if($this->moderock('meeting'))m('flow')->initflow('meeting')->fixedMeetings('');
-	}
 
+    }
+
+    // 每天下午执行
+    public function afternoonAction()
+    {
+
+    }
 
 }

webmain/webmainConfig.php.bak

@@ -46,7 +46,7 @@ return array(
 
     'meetsys_basurl'=>'https://mbackend.joyeey.com/admin/',  // 第三方会议-基础地址
     'meetsys_admin_name'=>'杰唯智能', // 第三方会议-会议管理员账号
-    'meetsys_admin_pass'=>substr(md5('Zhks2023_jw'), 0, 16), // 第三方会议-会议管理员pass
+    'meetsys_admin_pass'=>substr(md5('7uio98&UIO(*'), 0, 16), // 第三方会议-会议管理员pass
     'meetsys_admin_id'=>'1', // 第三方会议-会议管理员id
 
 );