1、安捷诚反馈

2、商机管理新增单据判断

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -323,8 +323,8 @@
     <string name="business_followup">我的商机</string>
     <string name="business_followup_people">商机跟进人</string>
     <string name="color_text">颜色</string>
-    <string name="business_number">商机数量</string>
-    <string name="business_Conversion_rate">商机转化率</string>
+    <string name="business_number">数量/金额</string>
+    <string name="business_Conversion_rate">转化率</string>
 
     <string name="business_stage">商机阶段</string>
     <string name="First_communication">初次沟通</string>

WeiChat/src/main/res/values/strings.xml

@@ -865,8 +865,8 @@
     <string name="business_followup">我的商机</string>
     <string name="business_followup_people">商机跟进人</string>
     <string name="color_text">颜色</string>
-    <string name="business_number">商机数量</string>
-    <string name="business_Conversion_rate">商机转化率</string>
+    <string name="business_number">数量/金额</string>
+    <string name="business_Conversion_rate">转化率</string>
 
     <string name="business_stage">商机阶段</string>
     <string name="First_communication">初次沟通</string>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Jan 28 20:19:03 CST 2019
+#Wed Mar 20 15:57:49 CST 2019
 debugName=971
-versionName=666
+versionName=670
 debugCode=971
-versionCode=221
+versionCode=225

app_core/common/src/main/java/com/common/system/MacUtil.java

@@ -173,6 +173,9 @@ public class MacUtil {
 
     private static String convertToMac(byte[] mac) {
         StringBuilder sb = new StringBuilder();
+        if (mac == null) {
+            return "";
+        }
         for (int i = 0; i < mac.length; i++) {
             byte b = mac[i];
             int value = 0;

app_core/common/src/main/res/values-en/strings.xml

@@ -318,7 +318,7 @@
     <string name="business_followup">My Niche</string>
     <string name="business_followup_people"> business followers </string>
     <string name="color_text"> color </string>
-    <string name="business_number">count</string>
+    <string name="business_number">count/money</string>
     <string name="business_Conversion_rate"> Percent</string>
     <string name="business_stage"> Step </string>
     <string name="First_communication"> Initial communication </string>

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -326,8 +326,8 @@
     <string name="business_followup">我的商机</string>
     <string name="business_followup_people">商机跟进人</string>
     <string name="color_text">颜色</string>
-    <string name="business_number">商机数量</string>
-    <string name="business_Conversion_rate">商机转化率</string>
+    <string name="business_number">数量/金额</string>
+    <string name="business_Conversion_rate">转化率</string>
 
     <string name="business_stage">商机阶段</string>
     <string name="First_communication">初次沟通</string>

app_core/common/src/main/res/values-zh-rTW/strings.xml

@@ -314,8 +314,8 @@
     <string name="business_followup">商機跟進</string>
     <string name="business_followup_people">商機跟進人</string>
     <string name="color_text">顏色</string>
-    <string name="business_number">商機數量</string>
-    <string name="business_Conversion_rate">商機轉化率</string>
+    <string name="business_number">數量/金額</string>
+    <string name="business_Conversion_rate">轉化率</string>
     <string name="business_stage">商機階段</string>
     <string name="First_communication">初次溝通</string>
     <string name="Product_show">產品演示</string>

app_core/common/src/main/res/values/strings.xml

@@ -869,8 +869,8 @@
     <string name="business_followup">我的商机</string>
     <string name="business_followup_people">商机跟进人</string>
     <string name="color_text">颜色</string>
-    <string name="business_number">商机数量</string>
-    <string name="business_Conversion_rate">商机转化率</string>
+    <string name="business_number">数量/金额</string>
+    <string name="business_Conversion_rate">转化率</string>
 
     <string name="business_stage">商机阶段</string>
     <string name="First_communication">初次沟通</string>

app_modular/appme/src/main/res/values-en/strings.xml

@@ -865,8 +865,8 @@
     <string name="business_followup">我的商机</string>
     <string name="business_followup_people">商机跟进人</string>
     <string name="color_text">颜色</string>
-    <string name="business_number">商机数量</string>
-    <string name="business_Conversion_rate">商机转化率</string>
+    <string name="business_number">数量/金额</string>
+    <string name="business_Conversion_rate">转化率</string>
 
     <string name="business_stage">商机阶段</string>
     <string name="First_communication">初次沟通</string>

app_modular/appme/src/main/res/values/strings.xml

@@ -865,8 +865,8 @@
     <string name="business_followup">我的商机</string>
     <string name="business_followup_people">商机跟进人</string>
     <string name="color_text">颜色</string>
-    <string name="business_number">商机数量</string>
-    <string name="business_Conversion_rate">商机转化率</string>
+    <string name="business_number">数量/金额</string>
+    <string name="business_Conversion_rate">转化率</string>
 
     <string name="business_stage">商机阶段</string>
     <string name="First_communication">初次沟通</string>

app_modular/apputils/src/main/java/com/modular/apputils/activity/BillInputActivity.java

@@ -383,6 +383,10 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
      * @param model
      */
     public void findBydbFind(BillGroupModel.BillModel model) {
+        findBydbFind(model, "");
+    }
+
+    public void findBydbFind(BillGroupModel.BillModel model, String condition) {
         String gridCaller = "";
         String fieldKey = model.getField();
         BillGroupModel mGroupModel = mBillAdapter.getBillGroupModel(model.getGroupIndex());
@@ -395,9 +399,14 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
             }
         }
         String mCondition = "";
-        if (dbFindCondition != null && dbFindCondition.containsKey(fieldKey)) {
-            mCondition = dbFindCondition.get(fieldKey);
+        if (TextUtils.isEmpty(condition)) {
+            if (dbFindCondition != null && dbFindCondition.containsKey(fieldKey)) {
+                mCondition = dbFindCondition.get(fieldKey);
+            }
+        } else {
+            mCondition = condition;
         }
+
         startActivityForResult(new Intent(ct, SelectNetAcitivty.class)
                         .putExtra("fieldKey", fieldKey)
                         .putExtra("caller", mGroupModel == null ? mBillPresenter.getFormCaller()

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/BusinessActivity.java

@@ -68,7 +68,7 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
     private ArrayList<ArrayList<String>> gridlists = new ArrayList<ArrayList<String>>();
     private String mWhichPage = "";
     private String gridData = "  [\n" +
-            "[\"颜色\",\"商机阶段\",\"商机数量\",\"商机转化率\"],\n" +
+            "[\"颜色\",\"商机阶段\",\"数量/金额\",\"转化率\"],\n" +
             "[\"#FF0000\",\"0\",\"0\",\"0\"],\n" +
             "[\"#00CCFF\",\"0\",\"0\",\"0\"],\n" +
             "[\"#FFFF00\",\"0\",\"0\",\"0\"],\n" +
@@ -256,11 +256,12 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
                 String color = chances.getJSONObject(i).getString("color");
                 int detno = chances.getJSONObject(i).getInteger("detno");
                 int count = chances.getJSONObject(i).getInteger("count");
+                double amount = chances.getJSONObject(i).getDouble("count");
                 items.add("#" + color);
                 colors.add("#" + color);
                 // items.add(String.valueOf(i + 1));
                 items.add(currentprocess);
-                items.add(String.valueOf(count));
+                items.add(String.valueOf(count) + "/" + CommonUtil.doubleFormat(amount));
                 counts.add(count);
                 countToatal = countToatal + count;
                 items.add(percent);

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/adapter/HListViewOneAdapter.java

@@ -59,13 +59,13 @@ public class HListViewOneAdapter extends BaseAdapter {
             for (int j=0;j<items.size();j++){
                 float weight=1.0f;
                 if (j==0){
-                    weight=0.1f;
+                    weight=0.2f;
                 }else if(j==2){
-                    weight=0.1f;
+                    weight=0.6f;
                 }else if (j==3){
-                    weight=0.1f;
+                    weight=0.2f;
                 }else{
-                    weight=3.5f;
+                    weight=3f;
                 }
                 TextView tv= CreateTextView(ct,weight);
                 holder.tv_item[j]=tv;

app_modular/appworks/src/main/java/com/uas/appworks/activity/businessManage/BusinessOvertimeListActivity.java

@@ -122,6 +122,11 @@ public class BusinessOvertimeListActivity extends MvpBaseActivity<BusinessManage
 
     }
 
+    @Override
+    public void requestOptionSuccess(String resultJson) {
+
+    }
+
     @Override
     public void requestFail(int flag, String failStr) {
         if (mPageIndex == 1){

app_modular/appworks/src/main/java/com/uas/appworks/activity/businessManage/BusinessRankListActivity.java

@@ -121,6 +121,11 @@ public class BusinessRankListActivity extends MvpBaseActivity<BusinessManageHome
 
     }
 
+    @Override
+    public void requestOptionSuccess(String resultJson) {
+
+    }
+
     @Override
     public void requestFail(int flag, String failStr) {
         if (mPageIndex == 1){

app_modular/appworks/src/main/java/com/uas/appworks/activity/businessManage/BusinessRecordListActivity.java

@@ -124,6 +124,11 @@ public class BusinessRecordListActivity extends MvpBaseActivity<BusinessManageHo
 
     }
 
+    @Override
+    public void requestOptionSuccess(String resultJson) {
+
+    }
+
     @Override
     public void requestFail(int flag, String failStr) {
         if (mPageIndex == 1){

app_modular/appworks/src/main/java/com/uas/appworks/activity/businessManage/businessManageHome/BusinessManageHomeActivity.java

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -21,6 +22,7 @@ import com.core.app.Constants;
 import com.core.base.activity.MvpBaseActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.time.wheel.OASigninPicker;
+import com.me.network.app.http.HttpRequest;
 import com.modular.apputils.utils.RecyclerItemDecoration;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
@@ -54,7 +56,7 @@ public class BusinessManageHomeActivity extends MvpBaseActivity<BusinessManageHo
     private RefreshLayout mRefreshLayout;
     private TextView mDataTimeTextView, mDataRefreshTextView,
             mRecordRefreshTextView, mOvertimeRefreshTextView,
-            mRankRefreshTextView, mAddProjectBtn, mAddOemBtn,
+            mRankRefreshTextView, mAddProjectBtn, mAddOemBtn, mAddCompanyBtn,
             mNewlyTextView, mChangeTextView, mWinTextView, mLoseTextView, mInvalidTextView,
             mFollowTextView;
     private String mDataDateTime, mDataRefreshTime, mRecordRefreshTime, mOvertimeRefreshTime, mRankRefreshTime;
@@ -138,6 +140,7 @@ public class BusinessManageHomeActivity extends MvpBaseActivity<BusinessManageHo
 
         mAddProjectBtn = menuView.findViewById(R.id.business_home_menu1);
         mAddOemBtn = menuView.findViewById(R.id.business_home_menu2);
+        mAddCompanyBtn = menuView.findViewById(R.id.business_home_menu3);
 
         mMenuPopupWindow = new PopupWindow(menuView, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
         mMenuPopupWindow.setBackgroundDrawable(new BitmapDrawable());
@@ -175,6 +178,7 @@ public class BusinessManageHomeActivity extends MvpBaseActivity<BusinessManageHo
         mHeaderFunnelLayout.setOnClickListener(this);
         mAddProjectBtn.setOnClickListener(this);
         mAddOemBtn.setOnClickListener(this);
+        mAddCompanyBtn.setOnClickListener(this);
 
         mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
             @Override
@@ -244,6 +248,15 @@ public class BusinessManageHomeActivity extends MvpBaseActivity<BusinessManageHo
                 mMenuPopupWindow.dismiss();
             }
             DisplayUtil.backgroundAlpha(mContext, 1f);
+        } else if (i == R.id.business_home_menu3) {
+            startActivity(new Intent(ct, BusinessBillInputActivity.class)
+                    .putExtra(Constants.Intents.CALLER, "BusinessChance")
+                    .putExtra(Constants.Intents.TITLE, getString(R.string.str_company_business_list))
+                    .putExtra(Constants.Intents.ID, 0));
+            if (mMenuPopupWindow != null) {
+                mMenuPopupWindow.dismiss();
+            }
+            DisplayUtil.backgroundAlpha(mContext, 1f);
         }
     }
 
@@ -256,11 +269,7 @@ public class BusinessManageHomeActivity extends MvpBaseActivity<BusinessManageHo
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.add_item) {
-            if (mMenuPopupWindow != null) {
-                View view = getWindow().findViewById(item.getItemId());
-                mMenuPopupWindow.showAsDropDown(view);
-                DisplayUtil.backgroundAlpha(mContext, 0.5f);
-            }
+            mPresenter.getOptionList(this, "sys", "isNewBusinessChance");
             return true;
         }
         return super.onOptionsItemSelected(item);
@@ -318,6 +327,24 @@ public class BusinessManageHomeActivity extends MvpBaseActivity<BusinessManageHo
         analysisRank(rankBeans);
     }
 
+    @Override
+    public void requestOptionSuccess(String resultJson) {
+        if (TextUtils.isEmpty(resultJson)) {
+            mAddCompanyBtn.setVisibility(View.VISIBLE);
+            mAddProjectBtn.setVisibility(View.GONE);
+            mAddOemBtn.setVisibility(View.GONE);
+        } else {
+            mAddCompanyBtn.setVisibility(View.GONE);
+            mAddProjectBtn.setVisibility(View.VISIBLE);
+            mAddOemBtn.setVisibility(View.VISIBLE);
+        }
+        if (mMenuPopupWindow != null) {
+            View view = getWindow().findViewById(R.id.add_item);
+            mMenuPopupWindow.showAsDropDown(view);
+            DisplayUtil.backgroundAlpha(mContext, 0.5f);
+        }
+    }
+
     private <T extends Object> List<T> getCountList(List<T> tList, int count) {
         List<T> resultList = new ArrayList<>();
         if (tList != null) {
@@ -376,6 +403,16 @@ public class BusinessManageHomeActivity extends MvpBaseActivity<BusinessManageHo
     @Override
     public void requestFail(int flag, String failStr) {
         toast(failStr);
+        if (flag == BusinessManageHomePresenterImpl.REQUEST_OPTION_LIST) {
+            mAddCompanyBtn.setVisibility(View.VISIBLE);
+            mAddProjectBtn.setVisibility(View.GONE);
+            mAddOemBtn.setVisibility(View.GONE);
+        }
+        if (mMenuPopupWindow != null) {
+            View view = getWindow().findViewById(R.id.add_item);
+            mMenuPopupWindow.showAsDropDown(view);
+            DisplayUtil.backgroundAlpha(mContext, 0.5f);
+        }
     }
 
     private void showDateDialog(String year, String month, final TextView tv) {

app_modular/appworks/src/main/java/com/uas/appworks/activity/businessManage/businessManageHome/BusinessManageHomeContract.java

@@ -29,6 +29,8 @@ public class BusinessManageHomeContract {
         void requestAllSuccess(String resultJson, List<BusinessRecordBean> businessRecordBeans,
                                List<BusinessOverTimeBean> businessOverTimeBeans, List<BusinessRankBean> businessRankBeans);
 
+        void requestOptionSuccess(String resultJson);
+
         void requestFail(int flag, String failStr);
     }
 
@@ -42,5 +44,7 @@ public class BusinessManageHomeContract {
         void getBusinessRank(Context context, int pageIndex, int pageSize);
 
         void getBusinessAll(Context context, String dataTime, String salesmanCode);
+
+        void getOptionList(Context context, String caller, String code);
     }
 }

app_modular/appworks/src/main/java/com/uas/appworks/activity/businessManage/businessManageHome/BusinessManageHomePresenterImpl.java

@@ -34,6 +34,7 @@ public class BusinessManageHomePresenterImpl extends BaseMvpPresenter<BusinessMa
     public static final int REQUEST_BUSINESS_OVERTIME = 60;
     public static final int REQUEST_BUSINESS_RANK = 61;
     public static final int REQUEST_BUSINESS_ALL = 62;
+    public static final int REQUEST_OPTION_LIST = 63;
 
     @Override
     public void onMvpAttachView(BusinessManageHomeContract.IBusinessManageHomeView view, Bundle savedInstanceState) {
@@ -121,6 +122,21 @@ public class BusinessManageHomePresenterImpl extends BaseMvpPresenter<BusinessMa
                         .build(), this);
     }
 
+    @Override
+    public void getOptionList(Context context, String caller, String code) {
+        getMvpView().showLoading("");
+
+        HttpRequest.getInstance().sendRequest(CommonUtil.getAppBaseUrl(context),
+                new HttpParams.Builder()
+                        .url("ma/setting/config.action")
+                        .flag(REQUEST_OPTION_LIST)
+                        .method(Method.GET)
+                        .addParam("caller", caller)
+                        .addParam("code", code)
+                        .addHeader("Cookie", CommonUtil.getErpCookie(context))
+                        .build(), this);
+    }
+
     @Override
     public void onSuccess(int flag, Object o) throws Exception {
         getMvpView().hideLoading();
@@ -184,6 +200,9 @@ public class BusinessManageHomePresenterImpl extends BaseMvpPresenter<BusinessMa
                     getMvpView().requestAllSuccess("", new ArrayList<BusinessRecordBean>(), new ArrayList<BusinessOverTimeBean>(), new ArrayList<BusinessRankBean>());
                 }
                 break;
+            case REQUEST_OPTION_LIST:
+                getMvpView().requestOptionSuccess(result);
+                break;
             default:
                 break;
         }
@@ -290,6 +309,9 @@ public class BusinessManageHomePresenterImpl extends BaseMvpPresenter<BusinessMa
                 LogUtil.prinlnLongMsg("raoAllFail", failStr);
                 getMvpView().requestFail(flag, failStr);
                 break;
+            case REQUEST_OPTION_LIST:
+                getMvpView().requestFail(flag, failStr);
+                break;
             default:
                 break;
         }

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerManageActivity.java

@@ -391,6 +391,7 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
                 mBillListConfig.setCondition(mCondition);
                 billListConfigs.add(mBillListConfig);
                 startActivity(new Intent(ct, BillListActivity.class)
+                        .putExtra(Constants.Intents.INPUT_CLASS, VisitRecordBillInputActivity.class)
                         .putExtra(Constants.Intents.CONFIG, billListConfigs)
                         .putExtra(Constants.Intents.TITLE, "拜访报告")
                         .putExtra(Constants.Intents.DETAILS_CLASS, BillDetailsActivity.class)

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerVisitBillInputActivity.java

@@ -214,6 +214,34 @@ public class CustomerVisitBillInputActivity extends BillInputActivity {
             Intent intent = new Intent("com.modular.form.SelectAimActivity");
             intent.putExtra("search", companyName);
             startActivityForResult(intent, TAG_ADDRESS_SELECT);
+        } else if ("mp_bccode".equals(model.getField())) {
+            String master = CommonUtil.getMaster();
+            if ("DATACENTER".equals(master) || "N_SHYZ".equals(master) || "N_AJC".equals(master)) {
+                List<BillGroupModel.BillModel> allBillModels = mBillAdapter.getmAllBillModels();
+                String mp_cucode = "", mp_xmbh_user = "", mp_prjandcus_user = "";
+                for (BillGroupModel.BillModel billModel : allBillModels) {
+                    if (!TextUtils.isEmpty(billModel.getValue())) {
+                        if ("mp_cucode".equals(billModel.getField())) {
+                            mp_cucode = billModel.getValue();
+                        }
+                        if ("mp_xmbh_user".equals(billModel.getField())) {
+                            mp_xmbh_user = billModel.getValue();
+                        }
+                    }
+                    if ("mp_prjandcus_user".equals(billModel.getField())) {
+                        mp_prjandcus_user = billModel.getValue();
+                    }
+                }
+
+                if (TextUtils.isEmpty(mp_cucode) && TextUtils.isEmpty(mp_xmbh_user)) {
+                    toast("请先选择客户编号或项目编号");
+                    return;
+                }
+                String condition = "sign=\'" + mp_prjandcus_user + "\'";
+                findBydbFind(model, condition);
+            } else {
+                super.toSelect(position, model);
+            }
         } else {
             super.toSelect(position, model);
         }

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/VisitRecordBillInputActivity.java

@@ -3,16 +3,19 @@ package com.uas.appworks.crm3_0.activity;
 
 import android.content.Intent;
 import android.os.Handler;
+import android.text.TextUtils;
 
 import com.core.app.Constants;
 import com.core.utils.CommonUtil;
 import com.modular.apputils.activity.BillDetailsActivity;
 import com.modular.apputils.activity.BillInputActivity;
 import com.modular.apputils.activity.BillListActivity;
+import com.modular.apputils.model.BillGroupModel;
 import com.modular.apputils.model.BillListConfig;
 import com.uas.appworks.R;
 
 import java.util.ArrayList;
+import java.util.List;
 
 //拜访报告录入界面
 public class VisitRecordBillInputActivity extends BillInputActivity {
@@ -78,8 +81,42 @@ public class VisitRecordBillInputActivity extends BillInputActivity {
         }, 2000);
     }
 
+    @Override
+    public void toSelect(int position, BillGroupModel.BillModel model) {
+        if ("cup_name".equals(model.getField())) {
+            String master = CommonUtil.getMaster();
+            if ("DATACENTER".equals(master) || "N_SHYZ".equals(master) || "N_AJC".equals(master)) {
+                List<BillGroupModel.BillModel> allBillModels = mBillAdapter.getmAllBillModels();
+                String vr_cuuu = "", vr_prjcode = "", vr_prjandcus_user = "";
+                for (BillGroupModel.BillModel billModel : allBillModels) {
+                    if (!TextUtils.isEmpty(billModel.getValue())) {
+                        if ("vr_cuuu".equals(billModel.getField())) {
+                            vr_cuuu = billModel.getValue();
+                        }
+                        if ("vr_prjcode".equals(billModel.getField())) {
+                            vr_prjcode = billModel.getValue();
+                        }
+                    }
+                    if ("vr_prjandcus_user".equals(billModel.getField())) {
+                        vr_prjandcus_user = billModel.getValue();
+                    }
+                }
 
-//    @Override
+                if (TextUtils.isEmpty(vr_cuuu) && TextUtils.isEmpty(vr_prjcode)) {
+                    toast("请先选择客户编号或项目编号");
+                    return;
+                }
+                String condition = "sign=\'" + vr_prjandcus_user + "\'";
+                findBydbFind(model, condition);
+            } else {
+                super.toSelect(position, model);
+            }
+        } else {
+            super.toSelect(position, model);
+        }
+    }
+
+    //    @Override
 //    public void toSelect(int position, BillGroupModel.BillModel model) {
 //        if ("C".equals(model.getType()) && "vr_group".equals(model.getField())) {
 //            LogUtil.i("gong", "position=" + position);

app_modular/appworks/src/main/java/com/uas/appworks/presenter/CustomerManagePresenter.java

@@ -149,14 +149,15 @@ public class CustomerManagePresenter extends BaseNetPresenter {
 
     private void handlerShowCustomerItems(JSONObject jsonObject) {
         List<EasyBaseModel> models = new ArrayList<>();
-        int lNum = JSONUtil.getInt(jsonObject, "lNum");//客户联系人
+        int lNum = jsonObject.containsKey("allNum") ?
+                JSONUtil.getInt(jsonObject, "allNum") : JSONUtil.getInt(jsonObject, "cNum");//客户联系人
         int cNum = JSONUtil.getInt(jsonObject, "cNum");//新增客户
         int vNum = JSONUtil.getInt(jsonObject, "vNum");//客户拜访数
         int oNum = JSONUtil.getInt(jsonObject, "oNum");//外勤数
-        models.add(new EasyBaseModel().setTitle("客户总数").setSubTitle(String.valueOf(cNum)));
+        models.add(new EasyBaseModel().setTitle("客户总数").setSubTitle(String.valueOf(lNum)));
         models.add(new EasyBaseModel().setTitle("新增客户数").setSubTitle(String.valueOf(cNum)));
         models.add(new EasyBaseModel().setTitle("客户拜访数").setSubTitle(String.valueOf(vNum)));
-        models.add(new EasyBaseModel().setTitle("外勤记录").setSubTitle(String.valueOf(oNum)));
+        models.add(new EasyBaseModel().setTitle("拜访客户数").setSubTitle(String.valueOf(oNum)));
         iCustomerManage.setShowCustomerAdapter(models);
     }
 
@@ -167,7 +168,7 @@ public class CustomerManagePresenter extends BaseNetPresenter {
                 JSONObject object = array.getJSONObject(i);
                 int id = JSONUtil.getInt(object, "id");
                 String name = JSONUtil.getText(object, "name");//客户名称
-                String birthday = DateFormatUtil.long2Str(JSONUtil.getTime(object, "birthday"),DateFormatUtil.YMD_HMS);//跟进时间
+                String birthday = DateFormatUtil.long2Str(JSONUtil.getTime(object, "birthday"), DateFormatUtil.YMD_HMS);//跟进时间
                 String state = JSONUtil.getText(object, "state");//状态
                 models.add(new EasyBaseModel().setId(id).setTitle(name).setSubTitle(birthday).setIconUrl(state));
             }
@@ -182,7 +183,7 @@ public class CustomerManagePresenter extends BaseNetPresenter {
                 JSONObject object = array.getJSONObject(i);
                 int id = JSONUtil.getInt(object, "id");
                 String name = JSONUtil.getText(object, "name");//客户名称
-                String fpTime = DateFormatUtil.long2Str(JSONUtil.getTime(object, "fpTime"),DateFormatUtil.YMD_HMS);//跟进时间
+                String fpTime = DateFormatUtil.long2Str(JSONUtil.getTime(object, "fpTime"), DateFormatUtil.YMD_HMS);//跟进时间
                 String state = JSONUtil.getText(object, "state");//状态
                 models.add(new EasyBaseModel().setId(id).setTitle(name).setSubTitle("最后跟进时间：" + fpTime).setIconUrl(state));
             }

app_modular/appworks/src/main/res/layout/pop_business_home_menu.xml

@@ -12,6 +12,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"
+        android:visibility="gone"
         android:gravity="center"
         android:text="项目商机"/>
     <View
@@ -24,6 +25,19 @@
         android:layout_height="wrap_content"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"
+        android:visibility="gone"
         android:gravity="center"
         android:text="OEM商机"/>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#cccccc"/>
+    <TextView
+        android:id="@+id/business_home_menu3"
+        android:layout_width="160dp"
+        android:layout_height="wrap_content"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:gravity="center"
+        android:text="公司商机"/>
 </LinearLayout>