فهرست منبع

会议议题自动

q 1 سال پیش
والد
کامیت
01d5ce0ad5
3فایلهای تغییر یافته به همراه30 افزوده شده و 36 حذف شده
  1. 5 4
      webmain/model/meetingModel.php
  2. 0 32
      webmain/model/meeting_keyModel.php
  3. 25 0
      webmain/task/openapi/openmeetAction.php

+ 5 - 4
webmain/model/meetingModel.php

@@ -23,17 +23,17 @@ class meetingClassModel extends Model
         if ($meetType == 1) {
             $sql        =  /** @lang text */
                 'select id, meeting_room, start_time, end_time, title
-                   from xinhu_meeting  where id <> '.$id.' and meet_state in (0, 1)
+                   from [Q]meeting  where id <> '.$id.' and meet_state in (0, 1)
                  union all
                  select id, meeting_room, start_time, end_time, title
-                   from xinhu_meeting_key where meet_state in (0, 1)';
+                   from [Q]meeting_key where meet_state in (0, 1)';
         } else {
             $sql        =  /** @lang text */
                 'select id, meeting_room, start_time, end_time, title
-                   from xinhu_meeting  where meet_state in (0, 1)
+                   from [Q]meeting  where meet_state in (0, 1)
                  union all
                  select id, meeting_room, start_time, end_time, title 
-                   from xinhu_meeting_key where id <> '.$id.' and meet_state in (0, 1)';
+                   from [Q]meeting_key where id <> '.$id.' and meet_state in (0, 1)';
         }
         m('log')->addlog("验证", $sql);
 
@@ -79,6 +79,7 @@ class meetingClassModel extends Model
 
     // 会议状态
     public function meetingState($stime, $etime, $type=1) {
+        // type == 1 获取状态码, type==2获取状态名
         $code = [0, 1, 2];
         $info = m('meeting')->hyarra;
 

+ 0 - 32
webmain/model/meeting_keyModel.php

@@ -3,36 +3,4 @@
 class meeting_keyClassModel extends Model
 {
 
-    /**
-     *	判断会议室是否重复申请了
-     */
-    public function isapplymsg($startdt, $enddt, $hyname, $id=0)
-    {
-        $msg 		= '';
-        $sql        = `select id, meeting_room, start_time, end_time from xinhu_meeting  where id <> {$id} and meet_state in (0, 1)
-                       union ALL
-                       select id, meeting_room, start_time, end_time from xinhu_meeting_key where id <> {$id} and meet_state in (0, 1)`;
-        $rows 		= $this->db->getall($sql);
-
-        foreach($rows as $k=>$rs){
-            if($rs['meeting_room'] != $hyname)continue;
-            $sdt = $rs['start_time'];
-            $edt = $rs['end_time'];
-            if(
-                ($sdt<=$startdt && $edt>$startdt)
-                || ($sdt<$enddt && $edt>=$enddt)
-                || ($sdt>$startdt && $edt<$enddt)
-                || ($sdt==$startdt && $edt==$enddt)
-            )$msg = '该会议室的时间段已被申请过了,主题“'.$rs['title'].'”';
-        }
-        return $msg;
-    }
-
-    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']);
-        }
-    }
 }

+ 25 - 0
webmain/task/openapi/openmeetAction.php

@@ -306,6 +306,12 @@ class openmeetClassAction extends openapiAction
                         "meeting_time" => $meet_time,
                         "meeting_moderator" => null,
                     ];
+
+                    // 自动改变状态
+                    $firstTopic = m('meeting_topics')->getone("mid={$meet['id']}",'id, topic_state', 'sort');
+                    if (isset($firstTopic['id']) && $firstTopic['topic_state'] < 2) {
+                        m('meeting')->firstMeetingTopicStart($meet['id']);
+                    }
                 }
             }
 
@@ -343,6 +349,25 @@ class openmeetClassAction extends openapiAction
         if (!isset($rawArr['meet_id']) && !isset($rawArr['meet_type'])) {
             return returnerror('参数缺失');
         }
+
+        // 党委会议会议议题处理
+        if ($rawArr['meet_type'] == 2) {
+            $meet = m('meeting_key')->getone("id={$rawArr['meet_id']}", "*");
+            if (isset($meet)) {
+                $mstime = $meet['start_time'];
+                $metime = $meet['end_time'];
+                $now = date("Y-m-d H:i:s");
+                // 会议中状态
+                if ($mstime < $now && $metime > $now) {
+                    // 自动改变议题状态
+                    $firstTopic = m('meeting_topics')->getone("mid={$meet['id']}",'id, topic_state', 'sort');
+                    if (isset($firstTopic['id']) && $firstTopic['topic_state'] < 2) {
+                        m('meeting')->firstMeetingTopicStart($meet['id']);
+                    }
+                }
+            }
+        }
+
         $meetId = $rawArr['meet_id'];
         $meetType = $rawArr['meet_type'];
         // 普通会议