提交代码

WeiChat/src/main/AndroidManifest.xml

@@ -958,7 +958,12 @@
             android:name=".ui.erp.activity.oa.SelectCollisionActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/select_join_number"
-            android:windowSoftInputMode="stateUnspecified|adjustNothing" />
+            android:windowSoftInputMode="stateUnspecified|adjustNothing" >
+            <intent-filter>
+                <action android:name="com.modular.main.SelectCollisionActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.erp.activity.oa.TeamsAttShowActivity"
             android:label="@string/sign_teams_rank" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddMeetingActivity.java

@@ -36,8 +36,8 @@ import com.iflytek.cloud.ui.RecognizerDialog;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.model.form.Data;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ApprovalActivity.java

@@ -40,8 +40,8 @@ import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SelectCollisionActivity.java

@@ -22,8 +22,8 @@ import com.core.widget.VoiceSearchView;
 import com.core.widget.listener.EditChangeListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.SelectCollisionAdapter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.SelectCollisionPresenter;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingDetailActivity.java

@@ -40,8 +40,8 @@ import com.core.xmpp.dao.ChatMessageDao;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.listener.ChatMessageListener;
 import com.core.xmpp.model.ChatMessage;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
 import com.modular.booking.model.BookingModel;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/SelectPContactsActivity.java

@@ -30,8 +30,8 @@ import com.core.utils.sortlist.BaseSortModel;
 import com.core.utils.sortlist.SideBar;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.SelectPCollisionAdapter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectActiveView;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/SelectPContactsPresenter.java

@@ -39,8 +39,8 @@ import com.core.xmpp.CoreService;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.dao.NewFriendDao;
 import com.core.xmpp.model.AddAttentionResult;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.uas.appcontact.model.contacts.Contacts;
 import com.uas.appcontact.utils.ContactsUtils;
 import com.xzjmyk.pm.activity.R;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/oa/SelectCollisionAdapter.java

@@ -13,7 +13,7 @@ import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.core.utils.helper.AvatarHelper;
 import com.core.utils.sortlist.BaseSortModel;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/oa/SelectPCollisionAdapter.java

@@ -15,7 +15,7 @@ import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.helper.AvatarHelper;
 import com.core.utils.sortlist.BaseSortModel;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SelectCollisionPresenter.java

@@ -10,6 +10,7 @@ import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.thread.ThreadPool;
@@ -22,8 +23,12 @@ import com.core.utils.CompanyHandlerInfoUtil;
 import com.core.utils.sortlist.BaseComparator;
 import com.core.utils.sortlist.BaseSortModel;
 import com.core.utils.sortlist.PingYinUtil;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
 import com.uas.appcontact.model.contacts.ContactsModel;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.db.dao.ContactsDao;
@@ -67,11 +72,16 @@ public class SelectCollisionPresenter {
             iSelectActiveView.showSureText(selectBean.getSureText());
         if (ListUtils.isEmpty(selects)) {
             if (selectBean.getTitle().equals(StringUtil.getMessage(R.string.select_share_friend))) {//分享好友
-                //企业架构+UU好友
-                loadShareFriendInThread();
+                loadShareFriendInThread(); //企业架构+UU好友
             } else {
-                //企业架构
-                loadDataInThread();
+                switch (selectBean.getResultCode()) {
+                    case 0x001:
+                        loadBookingCPersons(selectBean.getTitle());
+                        break;
+                    default:
+                        loadDataInThread(); //企业架构
+                        break;
+                }
             }
         } else {
             setUser2Sort(selects, true);
@@ -336,4 +346,21 @@ public class SelectCollisionPresenter {
     }
 
 
+    public void loadBookingCPersons(String name) {
+        HttpClient httpClient = new HttpClient.Builder("https://account.ubtob.com").build();
+
+        httpClient.Api().send(new HttpClient.Builder()
+                        .url("api/userspace/userspace/employees")
+                .add("name",name)
+                        .add("pageNumber","1")
+                .method(Method.GET)
+                        .build(),
+                new ResultSubscriber<>(new ResultListener<Object>() {
+                    @Override
+                    public void onResponse(Object o) {
+                        LogUtil.d("ResultSubscriber",""+JSON.toJSONString(o));
+                    }
+                }));
+
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/imp/ISelectActiveView.java

@@ -2,7 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.presenter.imp;
 
 import com.core.base.HttpImp;
 import com.core.utils.sortlist.BaseSortModel;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectEmUser;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/ComplaintDetailActivity.java

@@ -38,8 +38,8 @@ import com.core.widget.CustomerScrollView;
 import com.core.widget.MyListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.uas.appworks.OA.platform.adapter.PlatComAfAdapter;
 import com.uas.appworks.OA.platform.model.PlatComAfBean;
 import com.xzjmyk.pm.activity.R;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -48,8 +48,8 @@ import com.core.widget.MyListView;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.uas.appworks.OA.platform.adapter.PlatComAfAdapter;
 import com.uas.appworks.OA.platform.model.PlatComAfBean;
 import com.xzjmyk.pm.activity.R;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddB2BActivity.java

@@ -39,8 +39,8 @@ import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddErpActivity.java

@@ -31,8 +31,8 @@ import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/SelectCollisionTurnBean.java → app_core/common/src/main/java/com/core/model/SelectCollisionTurnBean.java

@@ -1,10 +1,10 @@
-package com.uas.appworks.OA.erp.model;
+package com.core.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.core.app.MyApplication;
-import com.me.appworks.R;
+import com.core.app.R;
 
 import java.util.List;
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/SelectEmUser.java → app_core/common/src/main/java/com/core/model/SelectEmUser.java

@@ -1,10 +1,9 @@
-package com.uas.appworks.OA.erp.model;
+package com.core.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.common.LogUtil;
-import com.core.model.EmployeesEntity;
 
 /**
  * 通用选择员工和选择部门通用实体类

app_core/network/build.gradle

@@ -23,7 +23,6 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile deps.junit
     compile deps.appcompatV7
     
@@ -34,6 +33,5 @@ dependencies {
     compile deps.converterGson
     compile deps.adapterRxjava
     compile deps.fastjson
-    testCompile deps.junit
-    compile deps.appcompatV7
+
 }

app_core/network/src/main/java/com/me/network/app/http/impl/RetrofitImpl.java

@@ -70,9 +70,12 @@ public class RetrofitImpl extends HttpBase {
 
 		LogInterceptor logInterceptor = new LogInterceptor();
 		logInterceptor.setBuilder(mbuilder);
-		okBuilder.addInterceptor(logInterceptor);	
-		okBuilder.cache(new Cache(mbuilder.getCacheFile(), mbuilder.getCacheFileSize()));
-		okBuilder.addInterceptor(new CacheInterceptor(String.valueOf(mbuilder.getCacheTime()),mbuilder.getCacheType()));
+		okBuilder.addInterceptor(logInterceptor);
+		if (mbuilder.getCacheFileSize() != 0) {
+			okBuilder.cache(new Cache(mbuilder.getCacheFile(), mbuilder.getCacheFileSize()));
+			okBuilder.addInterceptor(
+					new CacheInterceptor(String.valueOf(mbuilder.getCacheTime()), mbuilder.getCacheType()));
+		}
 
 
 		OkHttpClient client = okBuilder.build();

app_modular/appbooking/src/main/AndroidManifest.xml

@@ -5,7 +5,8 @@
     <application>
         <activity android:name=".activity.business.BBookingAddActivity" />
         <activity android:name=".activity.shares.BBSharesListActivity" />
-        <activity android:name=".activity.business.BBCompanyListActivity"></activity>
+        <activity android:name=".activity.business.BBCompanyListActivity" />
+        <activity android:name=".activity.business.MuilSelectBeanActivity"></activity>
     </application>
 
 </manifest>

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBCompanyListActivity.java

@@ -1,21 +1,39 @@
 package com.modular.booking.activity.business;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
+import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.base.BaseActivity;
+import com.core.model.OAConfig;
 import com.core.model.SelectBean;
+import com.core.model.SelectCollisionTurnBean;
 import com.core.widget.VoiceSearchView;
 import com.core.widget.view.EmptyLayout;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.impl.RetrofitImpl;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
 import com.modular.booking.R;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -25,22 +43,77 @@ import java.util.List;
 public class BBCompanyListActivity extends BaseActivity {
     
     private ListView list;
+    private List<SelectBean> formBean=new ArrayList<>();//数据来源
     private VoiceSearchView search_edit;
     private ListAdapter adapter;
     private EmptyLayout emptyLayout;
-    
+    private boolean isSingle=true;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_bbcompany_list);
+        initView();
+        initEvent();
     }
     
     public void initView(){
-        
+        getSupportActionBar().setTitle("企业");
+        list = (ListView) findViewById(R.id.listview);
+        search_edit = (VoiceSearchView) findViewById(R.id.voiceSearchView);
+        emptyLayout = new EmptyLayout(ct, list);
+        emptyLayout.setShowLoadingButton(false);
+        emptyLayout.setShowEmptyButton(false);
+        emptyLayout.setShowErrorButton(false);
+        emptyLayout.setEmptyViewRes(R.layout.view_empty);
+        adapter = new ListAdapter(formBean);
+        list.setAdapter(adapter);
     }
     
     public void initEvent(){
         
+        list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                List<SelectBean> formBeaans=  adapter.getFormBeaan();
+                if (!ListUtils.isEmpty(formBeaans)){
+                    String json=formBeaans.get(position).getJson();
+                    String name= JSON.parseObject(json).getString("company");
+                    ToastMessage(name);
+//                    startActivityForResult(new Intent(mContext,MuilSelectBeanActivity.class)
+//                            .putExtra("name",name),0x01);
+                    Intent intent = new Intent("com.modular.main.SelectCollisionActivity");
+                    SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
+                            .setResultCode(0x001)
+                            .setTitle(name)
+                            .setSingleAble(false);
+                    intent.putExtra(OAConfig.MODEL_DATA, bean);
+                    startActivityForResult(intent, 0x02);
+                }
+            }
+        });
+        search_edit.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+                if (!StringUtil.isEmpty(editable.toString())){
+                    searchBykey(editable.toString());
+                }else{
+                    formBean.clear();
+                    if (adapter!=null) {
+                        adapter.notifyDataSetChanged();
+                    }
+                }
+                
+            }
+        });
     }
 
     class ListAdapter extends BaseAdapter {
@@ -83,10 +156,10 @@ public class BBCompanyListActivity extends BaseActivity {
         public View getView(int i, View view, ViewGroup viewGroup) {
            ListAdapter.ViewHoler holer = null;
             if (view == null) {
-                view = LayoutInflater.from(ct).inflate(com.core.app.R.layout.select_list_item, null);
+                view = LayoutInflater.from(ct).inflate(R.layout.select_list_item, null);
                 holer = new ListAdapter.ViewHoler();
-                holer.select_scb = (CheckBox) view.findViewById(com.core.app.R.id.select_scb);
-                holer.name_tv = (TextView) view.findViewById(com.core.app.R.id.name_tv);
+                holer.select_scb = (CheckBox) view.findViewById(R.id.select_scb);
+                holer.name_tv = (TextView) view.findViewById(R.id.name_tv);
                 view.setTag(holer);
             } else {
                 holer = (ListAdapter.ViewHoler) view.getTag();
@@ -94,12 +167,12 @@ public class BBCompanyListActivity extends BaseActivity {
             chche = formBeaan.get(i);
             holer.name_tv.setText(StringUtil.isEmpty(chche.getName()) ? "" : chche.getName());
             holer.select_scb.setChecked(chche.isClick());
-//            if (isSingle) {
-//                holer.select_scb.setVisibility(View.GONE);
-//            } else {
-//                holer.select_scb.setFocusable(false);
-//                holer.select_scb.setClickable(false);
-//            }
+            if (isSingle) {
+                holer.select_scb.setVisibility(View.GONE);
+            } else {
+                holer.select_scb.setFocusable(false);
+                holer.select_scb.setClickable(false);
+            }
             return view;
         }
 
@@ -108,4 +181,56 @@ public class BBCompanyListActivity extends BaseActivity {
             TextView name_tv;
         }
     }
+    
+    
+    public void searchBykey(String key){
+        LogUtil.d("ResultSubscriber","key:"+key);
+        HttpClient httpClient=new HttpClient.Builder("https://account.ubtob.com/")
+                .httpBase(RetrofitImpl.getInstance())
+                .build();
+
+        httpClient.Api().send(new HttpClient.Builder("api/userspace/userSpaceDetail/keyword")
+                .add("keyword",key)
+                .add("pageNumber","1")
+                .method(Method.GET)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                LogUtil.prinlnLongMsg("ResultSubscriber","result:"+ o);
+                if (JSONUtil.validate(o.toString())){
+                    formBean.clear();
+                JSONArray jsonArray= JSON.parseObject(o.toString()).getJSONArray("listdata");
+                if (ListUtils.isEmpty(jsonArray)){
+                    emptyLayout.showEmpty();
+                    adapter.notifyDataSetChanged();
+                    return;
+                }
+                for(int i=0;i<jsonArray.size();i++){
+                    JSONObject jsonObject=jsonArray.getJSONObject(i);
+                    SelectBean selectBean=new SelectBean();
+                    selectBean.setName(jsonObject.getString("company"));
+                    selectBean.setJson(jsonObject.toJSONString());
+                    formBean.add(selectBean);
+                }
+                if (adapter!=null){
+                    adapter.notifyDataSetChanged();
+                }
+                }
+                
+            }
+        }));
+                
+    }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode){
+            case 0x01:
+            String name= data.getStringExtra("name");
+            setResult(0x02,new Intent().putExtra("name",name));
+            finish();
+            break;
+        }
+    }
 }

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -42,13 +42,16 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
     private TextView tvBookTimes;
     private RelativeLayout remarkRl;
     private RelativeLayout topic_rl;
+    private RelativeLayout  rl_company;
     private EditText tv_book_topic;
     private TextView tvBookAddress;
+    private TextView tv_book_company;
     private double latitude;
     private double longitude;
     private int imId;
     private String startTime;
     private String endTime;
+    
     private EditText et_book_content;
     BookingModel model;
     private Button bt_commit;
@@ -72,6 +75,7 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
         rlObject.setOnClickListener(this);
         companyAddRl.setOnClickListener(this);
         remarkRl.setOnClickListener(this);
+        rl_company.setOnClickListener(this);
         topic_rl.setOnClickListener(this);
 
         gv_topic.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -93,8 +97,10 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
         tvBookTimes = (TextView) findViewById(R.id.tv_book_times);
         remarkRl = (RelativeLayout) findViewById(R.id.remark_rl);
         rlObject = (RelativeLayout) findViewById(R.id.rl_object);
-
+        rl_company= (RelativeLayout) findViewById(R.id.rl_company);
         topic_rl = (RelativeLayout) findViewById(R.id.topic_rl);
+
+        tv_book_company=(TextView) findViewById(R.id.tv_book_company);
         tvBookAddress = (TextView) findViewById(R.id.tv_book_address);
         et_book_content = (EditText) findViewById(R.id.et_book_content);
 
@@ -177,7 +183,8 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
                 startActivityForResult(intent,0x01);
             }
         } else if (i == R.id.rl_company) {
-
+            Intent  intent = new Intent(this,   BBCompanyListActivity.class);
+            startActivityForResult(intent,0x02);
         }
     }
 
@@ -196,7 +203,8 @@ public class BBookingAddActivity extends BaseActivity implements View.OnClickLis
                 tvBookObject.setText(names.toString());
                 break;
             case 0x02://企业
-
+               String name=data.getStringExtra("name");
+            tv_book_company.setText(name);
                 break;
             case 0x23://地址
                 PoiInfo poi = data.getParcelableExtra("resultKey");

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/MuilSelectBeanActivity.java

@@ -0,0 +1,43 @@
+package com.modular.booking.activity.business;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.core.base.BaseActivity;
+import com.modular.booking.R;
+
+public class MuilSelectBeanActivity extends BaseActivity{
+
+    private String name;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_muil_select_bean);
+        if (getIntent()!=null)
+        {
+            name=getIntent().getStringExtra("name");
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_about, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() ==R.id.app_about) {
+          setResult(0x01,new Intent().putExtra("name",name));
+          finish();
+        }
+
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+        }
+        return super.onOptionsItemSelected(item);
+
+    }
+}

app_modular/appbooking/src/main/res/layout/activity_muil_select_bean.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.modular.booking.activity.business.MuilSelectBeanActivity">
+
+</android.support.constraint.ConstraintLayout>

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/AddFlihtsActivity.java

@@ -23,8 +23,8 @@ import com.core.utils.ToastUtil;
 import com.core.widget.crouton.Crouton;
 import com.lidroid.xutils.ViewUtils;
 import com.uas.appworks.OA.erp.model.FlightsModel;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.uas.appworks.OA.erp.presenter.AddFlihtsPresenter;
 import com.uas.appworks.OA.erp.view.IAddFlihtsView;
 import com.me.appworks.R;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/AddFlihtsPresenter.java

@@ -25,7 +25,7 @@ import com.uas.appworks.OA.erp.model.EmployeesModel;
 import com.uas.appworks.OA.erp.model.FlightsModel;
 import com.uas.appworks.OA.erp.model.FlightsTimeModel;
 import com.uas.appworks.OA.erp.model.HrorgsModel;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectEmUser;
 import com.uas.appworks.OA.erp.view.IAddFlihtsView;
 
 import java.util.ArrayList;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/view/IAddFlihtsView.java

@@ -3,7 +3,7 @@ package com.uas.appworks.OA.erp.view;
 
 import com.core.base.HttpImp;
 import com.uas.appworks.OA.erp.model.FlightsModel;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectEmUser;
 
 import java.util.ArrayList;
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/PlatWDdetailyActivity.java

@@ -45,8 +45,8 @@ import com.core.widget.CustomerScrollView;
 import com.core.widget.MyListView;
 import com.me.appworks.R;
 import com.uas.appworks.OA.erp.activity.WorkDailyAddActivity;
-import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.uas.appworks.OA.erp.model.SelectEmUser;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.uas.appworks.OA.platform.adapter.PlatComAfAdapter;
 import com.uas.appworks.OA.platform.model.PlatComAfBean;