|
|
@@ -29,7 +29,6 @@ import com.core.widget.VoiceSearchView;
|
|
|
import com.core.widget.listener.EditChangeListener;
|
|
|
import com.handmark.pulltorefresh.library.PullToRefreshBase;
|
|
|
import com.handmark.pulltorefresh.library.PullToRefreshListView;
|
|
|
-import com.uas.appworks.OA.erp.activity.MeetDetailsActivity;
|
|
|
import com.uas.appworks.OA.erp.model.MeetEntity;
|
|
|
import com.uas.appworks.R;
|
|
|
|
|
|
@@ -275,7 +274,7 @@ public class MeetingActivity extends BaseActivity {
|
|
|
// 状态更新为已结束，否则即使超过会议结束时间状态也是进行中
|
|
|
String str = entities.get(i).getMa_stage();
|
|
|
if (str == null || str.trim().length() <= 0) {
|
|
|
- if (TimeUtils.f_str_2_long(entities.get(i).getMa_starttime()) > System.currentTimeMillis())
|
|
|
+ if (TimeUtils.f_str_2_long(entities.get(i).getMa_starttime())<= System.currentTimeMillis())
|
|
|
str = getResources().getString(R.string.doing);
|
|
|
else
|
|
|
str = getResources().getString(R.string.not_bigan);
|
Bitliker