|
@@ -64,10 +64,14 @@ class flow_meetingClassModel extends flowModel
|
|
|
$nzt = 0;
|
|
|
} else {
|
|
|
$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);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if ($stime <= $time && $nzt != 2){
|
|
|
+ if ($stime <= $time && $nzt != 2) {
|
|
|
$nzt = 1;
|
|
|
}
|
|
|
|
|
@@ -86,7 +90,12 @@ class flow_meetingClassModel extends flowModel
|
|
|
|
|
|
public function getstatezt($zt)
|
|
|
{
|
|
|
- return '<font color="'.$this->hyarrb[$zt].'">'.$this->hyarra[$zt].'</font>';
|
|
|
+ if (isset($this->hyarrb[$zt])) {
|
|
|
+ $html = '<font color="'.$this->hyarrb[$zt].'">'.$this->hyarra[$zt].'</font>';
|
|
|
+ return $html;
|
|
|
+ } else {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// $ors当前单据操作信息,$crs提交过来的信息
|
|
@@ -133,6 +142,13 @@ class flow_meetingClassModel extends flowModel
|
|
|
];
|
|
|
}
|
|
|
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'] == 'enableMeeting') {
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -146,7 +162,7 @@ class flow_meetingClassModel extends flowModel
|
|
|
public function flowcheckfinsh($sm) {
|
|
|
|
|
|
// 会议议题状态全部设置为1
|
|
|
- m('meeting_topic')->update(['topic_state'=>'1'], 'mid='.$this->id);
|
|
|
+// m('meeting_topics')->update(['topic_state'=>'1'], 'mid='.$this->id);
|
|
|
|
|
|
}
|
|
|
|
|
@@ -162,4 +178,5 @@ class flow_meetingClassModel extends flowModel
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
}
|