Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	WeiChat/src/main/AndroidManifest.xml

WeiChat/src/main/AndroidManifest.xml

@@ -471,6 +471,11 @@
         <activity
             android:name=".ui.erp.activity.oa.OutofficeSetActivity"
             android:label="签到设置" />
+        <activity android:name=".ui.erp.activity.oa.TestActivity"></activity>
+        <activity android:name=".ui.erp.activity.oa.OutSigninOKActivity"
+            android:label="签到"/>
+        <activity android:name=".ui.erp.activity.crm.ContactManAddActivity" >
+        </activity>
         <activity android:name=".ui.erp.activity.oa.TestActivity" />
         <activity
             android:name=".ui.erp.activity.oa.OutSigninOKActivity"

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/crm/Business.java

@@ -10,6 +10,7 @@ public class Business {
     线索来源： XXXX
     联系方式： XXXX
     备注：        XXXX*/
+    private int bc_id;
     private String num;
     private String name;
     private String leader;
@@ -103,4 +104,12 @@ public class Business {
     public void setIsChecked(boolean isChecked) {
         this.isChecked = isChecked;
     }
+
+    public int getBc_id() {
+        return bc_id;
+    }
+
+    public void setBc_id(int bc_id) {
+        this.bc_id = bc_id;
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessActivity.java

@@ -4,6 +4,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -19,6 +21,8 @@ import android.widget.PopupWindow;
 import android.widget.SimpleAdapter;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
@@ -26,12 +30,18 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.HListViewAdapter;
 import com.xzjmyk.pm.activity.ui.erp.adapter.HListViewOneAdapter;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller;
+import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.view.FunnelView;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -101,8 +111,11 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
     }
 
     public void initData() {
+        String month=new SimpleDateFormat("yyyyMM").format(DateFormatUtil.getTimesMonthmorning());
+        sendHttpResquest("to_char(bc_recorddate,'yyyymm')="+month);
+
         gridlists = (ArrayList) JSON.parseArray(gridData, ArrayList.class);
-        hl_adapter = new HListViewOneAdapter(this, gridlists);
+        hl_adapter = new HListViewOneAdapter(ct, gridlists);
         lv_grid_dispaly.setAdapter(hl_adapter);
         layout.setVisibility(View.VISIBLE);
 
@@ -172,6 +185,63 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
         }
     }
 
+    private Handler mHandler=new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what){
+                case Constants.HTTP_SUCCESS_INIT:
+                    progressDialog.dismiss();
+                    gridlists.clear();
+                    Log.i(TAG, "json:" + msg.getData().getString("result"));
+                   JSONObject root= JSON.parseObject(msg.getData().getString("result"));
+                   JSONArray chances= root.getJSONArray("chances");
+                    if (!chances.isEmpty()){
+                        ArrayList<String> items=new ArrayList<>();
+                        items.add("颜色");
+                        items.add("序号");
+                        items.add("商机阶段");
+                        items.add("商机阶段");
+                        items.add("商机转化率");
+                        gridlists.add(items);
+                       for (int i=0;i<chances.size();i++) {
+                            items=new ArrayList<>();
+                           String currentprocess = chances.getJSONObject(i).getString("currentprocess");
+                           String percent = chances.getJSONObject(i).getString("percent");
+                           int count = chances.getJSONObject(i).getInteger("count");
+                           items.add("#FF0000");
+                           items.add(String.valueOf(i+1));
+                           items.add(currentprocess);
+                           items.add(String.valueOf(count));
+                           items.add(percent);
+                           gridlists.add(items);
+                       }
+                    }
+                    //gridlists = (ArrayList) JSON.parseArray(gridData, ArrayList.class);
+                    hl_adapter = new HListViewOneAdapter(ct, gridlists);
+                    lv_grid_dispaly.setAdapter(hl_adapter);
+                    layout.setVisibility(View.VISIBLE);
+                    funnelView.animateY();
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "json:" + msg.getData().getString("result"));
+                    break;
+            }
+        }
+    };
+
+    private void sendHttpResquest(String currentdate){
+        progressDialog.show();
+        String url= Constants.getAppBaseUrl(ct)+"/mobile/crm/getBusinessChancebyMonth.action";
+        Map<String,Object> params=new HashMap<>();
+        if (StringUtils.isEmpty(currentdate)){
+            currentdate="to_char(bc_recorddate,'yyyymm')=201607";
+        }
+        params.put("currentdate", currentdate);
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, Constants.HTTP_SUCCESS_INIT, null, null, "post");
+    }
 
     private PopupWindow popupWindow = null;
 
@@ -191,7 +261,43 @@ public class BusinessActivity extends BaseActivity implements View.OnClickListen
             plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                 @Override
                 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                    switch (position) {
+                        case 0:
+                            String month=new SimpleDateFormat("yyyyMM").format(DateFormatUtil.getTimesMonthmorning());
+                            sendHttpResquest("to_char(bc_recorddate,'yyyymm')=" + month);
+
+                            break;
+                        case 1://本月
+                             month=new SimpleDateFormat("yyyyMM").format(DateFormatUtil.getTimesMonthmorning());
+                            sendHttpResquest("to_char(bc_recorddate,'yyyymm')="+month);
+
+                            break;
+                        case 2://上月
+                            String lastMonth=new SimpleDateFormat("yyyyMM").format(DateFormatUtil.getLastMonthStartMorning());
+                            sendHttpResquest("to_char(bc_recorddate,'yyyymm')="+lastMonth);
+
+                            break;
+                        case 3://本季度
+                            String quarterStart=new SimpleDateFormat("yyyyMM").format(DateFormatUtil. getCurrentQuarterStartTime());
+                            String quarterEnd=new SimpleDateFormat("yyyyMM").format(DateFormatUtil. getCurrentQuarterEndTime());
 
+                            sendHttpResquest("to_char(bc_recorddate,'yyyymm')>="+quarterStart+" and to_char(bc_recorddate,'yyyymm')< "+quarterEnd);
+                            break;
+                        case 4://上季度
+                            String preStart=new SimpleDateFormat("yyyyMM").format(DateFormatUtil. getPreQuarterStartTime());
+                            String preEnd=new SimpleDateFormat("yyyyMM").format(DateFormatUtil.getPreQuarterEndTime());
+                            sendHttpResquest("to_char(bc_recorddate,'yyyymm')>="+preStart+" and to_char(bc_recorddate,'yyyymm')< "+preEnd);
+                            break;
+                        case 5://本年度
+                            String currentYear=new SimpleDateFormat("yyyy").format(DateFormatUtil.getCurrentYearStartTime());
+                            sendHttpResquest("to_char(bc_recorddate,'yyyy')="+currentYear);
+                            break;
+                        case 6://上年度
+                            String preYear=new SimpleDateFormat("yyyy").format(DateFormatUtil.getPreYearStartTime());
+                            sendHttpResquest("to_char(bc_recorddate,'yyyy')="+preYear);
+                            break;
+                    }
+                    popupWindow.dismiss();
                 }
             });
             popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth() / 3, windowManager.getDefaultDisplay().getHeight() / 3);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessAddActivity.java

@@ -1,12 +1,31 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
+import android.os.Handler;
+import android.os.Message;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.andreabaccega.widget.FormEditText;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @功能:商机添加
@@ -14,8 +33,38 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
  * @param:
  * @return:
  */
-public class BusinessAddActivity extends BaseActivity {
+public class BusinessAddActivity extends BaseActivity implements View.OnClickListener {
+
+    @ViewInject(R.id.et_business_no)
+    private FormEditText et_business_no; // 天数
+    @ViewInject(R.id.et_business_name)
+    private FormEditText et_business_name;
+    @ViewInject(R.id.et_business_source)
+    private FormEditText et_business_source;
+    @ViewInject(R.id.et_business_phone)
+    private FormEditText et_business_phone;
+    @ViewInject(R.id.et_business_createTime)
+    private FormEditText et_business_createTime;
+    @ViewInject(R.id.et_business)
+    private FormEditText  et_business;
+    @ViewInject(R.id.et_business_jieDuan)
+    private FormEditText et_business_jieDuan;
+    @ViewInject(R.id.et_business_enterTime)
+    private FormEditText et_business_enterTime;
+    @ViewInject(R.id.et_business_enterMan)
+    private FormEditText et_business_enterMan;
+    @ViewInject(R.id.et_company_name)
+    private FormEditText et_company_name;
+    @ViewInject(R.id.et_company_address)
+    private FormEditText et_company_address;
+    @ViewInject(R.id.et_company_man)
+    private FormEditText et_company_man;
+    @ViewInject(R.id.et_company_position)
+    private FormEditText et_company_position;
+    @ViewInject(R.id.et_company_tele)
+    private FormEditText et_company_tele;
 
+    private List<String> lists = new ArrayList<String>();
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -26,7 +75,15 @@ public class BusinessAddActivity extends BaseActivity {
     }
 
     private void initListener() {
+        et_business.setOnClickListener(this);
+        et_business_jieDuan.setOnClickListener(this);
+        et_business_source.setOnClickListener(this);
+        et_business_enterMan.setOnClickListener(this);
 
+        et_business.setKeyListener(null);
+        et_business_jieDuan.setKeyListener(null);
+        et_business_source.setKeyListener(null);
+        et_business_enterMan.setKeyListener(null);
     }
 
     private void initData() {
@@ -34,9 +91,28 @@ public class BusinessAddActivity extends BaseActivity {
     }
 
     private void initView() {
+        ViewUtils.inject(this);
         getSupportActionBar().setTitle("新建商机");
     }
 
+    @Override
+    public void onClick(View v) {
+       switch (v.getId()){
+           case R.id.et_business:
+               loadBusiness();
+               break;
+           case R.id.et_business_source:
+               loadSource();
+               break;
+           case R.id.et_business_enterMan:
+               loadManGenJin();
+               break;
+          case R.id.et_business_jieDuan:
+               loadJieDuan();
+              break;
+       }
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.main_btn_submit, menu);
@@ -48,6 +124,8 @@ public class BusinessAddActivity extends BaseActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
+
+
                 break;
             case android.R.id.home:
                 onBackPressed();
@@ -55,4 +133,167 @@ public class BusinessAddActivity extends BaseActivity {
         }
         return true;
     }
+
+    private static final int LOAD_SOURCE=2;
+    private static  final int LOAD_BUSINESS=3;
+    private static  final int LOAD_JIEDUAN=4;
+    private static  final int LOAD_MANGENJIN=5;
+    private Handler mHandler=new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what){
+                case Constants.HTTP_SUCCESS_INIT:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    break;
+                case LOAD_BUSINESS:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                   break;
+                case LOAD_JIEDUAN:
+                    progressDialog.dismiss();
+                    lists.clear();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    String json= msg.getData().getString("result");
+                    JSONArray array= JSON.parseObject(json).getJSONArray("stages");
+                    if (!array.isEmpty()){
+                    for (int i = 0; i < array.size(); i++) {
+                        lists.add(array.getJSONObject(i).getString("BS_NAME"));
+                    }
+                    }
+                    if (lists.isEmpty()) {
+                        lists.add("无");
+                    }
+                    showSimpleDialog(et_business_jieDuan,"商机阶段");
+                    break;
+                case LOAD_MANGENJIN:
+                    progressDialog.dismiss();
+                    lists.clear();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                     json= msg.getData().getString("result");
+                     array= JSON.parseObject(json).getJSONArray("recorders");
+                    if (!array.isEmpty()){
+                        for (int i = 0; i < array.size(); i++) {
+                            lists.add(array.getJSONObject(i).getString("BC_RECORDER"));
+                        }
+                    }
+                    if (lists.isEmpty()) {
+                        lists.add("无");
+                    }
+                    showSimpleDialog(et_business_enterMan, "跟进人");
+                    break;
+                case LOAD_SOURCE:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    break;
+
+            }
+        }
+    };
+
+    /**
+      * @desc:保存商机
+      * @author：Arison on 2016/7/20
+      */
+    private void sendHttpResquest(){
+        progressDialog.show();
+        String url= Constants.getAppBaseUrl(ct)+"crm/chance/saveBusinessChance.action";
+        Map<String,Object> params=new HashMap<>();
+        params.put("formStore", "");
+        params.put("caller", "BusinessChance");
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, Constants.HTTP_SUCCESS_INIT, null, null, "get");
+    }
+
+
+    /**
+      * @desc:加载来源
+      * @author：Arison on 2016/7/20
+      */
+    public void loadSource(){
+        progressDialog.show();
+        String url= Constants.getAppBaseUrl(ct)+"/mobile/crm/getBusinessChanceCombo.action";
+        Map<String,Object> params=new HashMap<>();
+        params.put("caller", "nichefrom");
+        params.put("field", "bc_from");
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, LOAD_SOURCE, null, null, "post");
+    }
+
+    /**
+     * @desc:加载商机库
+     * @author：Arison on 2016/7/20
+     */
+    public void loadBusiness(){
+        progressDialog.show();
+        String url= Constants.getAppBaseUrl(ct)+"/mobile/crm/getBusinessChanceCombo.action";
+        Map<String,Object> params=new HashMap<>();
+        params.put("caller", "nichefrom");
+        params.put("field", "bc_nichehouse");
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers,LOAD_BUSINESS, null, null, "post");
+    }
+
+
+
+    /**
+     * @desc:加载阶段
+     * @author：Arison on 2016/7/20
+     */
+    public void loadJieDuan(){
+        progressDialog.show();
+        String url= Constants.getAppBaseUrl(ct)+"/mobile/crm/getBusinessChanceStage.action";
+        Map<String,Object> params=new HashMap<>();
+        params.put("condition", "1=1");
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, LOAD_JIEDUAN, null, null, "post");
+    }
+
+
+
+    /**
+     * @desc:加载跟进人
+     * @author：Arison on 2016/7/20
+     */
+    public void loadManGenJin(){
+        progressDialog.show();
+        String url= Constants.getAppBaseUrl(ct)+"/mobile/crm/getBusinessChanceRecorder.action";
+        Map<String,Object> params=new HashMap<>();
+        params.put("caller", "employee");
+        params.put("condition", "1=1");
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, LOAD_MANGENJIN, null, null, "post");
+    }
+
+
+    private SingleDialog singleDialog;
+    public void showSimpleDialog(final FormEditText et,String title) {
+        if (singleDialog!=null){
+            if (singleDialog.isShowing())
+            return;
+        }
+        singleDialog = new SingleDialog(ct, title,
+                    new SingleDialog.PickDialogListener() {
+                        @Override
+                        public void onListItemClick(int position, String value) {
+                           et.setText(value);
+                        }
+                    });
+            singleDialog.show();
+            singleDialog.initViewData(lists);
+       /* } else {
+            singleDialog.show();
+            singleDialog.initViewData(lists);
+        }*/
+    }
+
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailActivty.java

@@ -2,8 +2,10 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import android.os.Handler;
+import android.os.Message;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,6 +16,9 @@ import android.widget.LinearLayout;
 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.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
@@ -22,9 +27,14 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.crm.Business;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+
 
 import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * @功能:商机列表
@@ -39,6 +49,9 @@ public class BusinessDetailActivty extends BaseActivity {
     @ViewInject(R.id.list_business)
     private PullToRefreshListView mlist;
     private ArrayList<Business> mData = new ArrayList<Business>();
+
+    private String formCondition;
+    private String gridCondition;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -69,14 +82,18 @@ public class BusinessDetailActivty extends BaseActivity {
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 final BussinessDetailAdapter.ViewHolder holder = (BussinessDetailAdapter.ViewHolder) view.getTag();
                 startActivity(new Intent(BusinessDetailActivty.this, BusinessDetailInfoActivity.class)
-                        .putExtra("type", holder.type));
+                        .putExtra("type", holder.type)
+                .putExtra("formCondition",formCondition+"="+holder.bc_id)
+                .putExtra("gridCondition",gridCondition+"="+holder.bc_id)
+                );
             }
         });
     }
-
+    int type;
     private void initData() {
+        sendHttpResquest(Constants.HTTP_SUCCESS_INIT,1);
         Intent intent = getIntent();
-        int type = 0;
+         type = 0;
         if (intent != null) {
             type = intent.getIntExtra("bt_type", 0);
         }
@@ -90,7 +107,7 @@ public class BusinessDetailActivty extends BaseActivity {
             getSupportActionBar().setTitle("分配");
             ll_top_state.setVisibility(View.GONE);
         }
-        for (int i = 0; i < 22; i++) {
+       /* for (int i = 0; i < 22; i++) {
             Business model = new Business();
             model.setNum("013223" + i);
             model.setName("xxx" + i);
@@ -100,7 +117,7 @@ public class BusinessDetailActivty extends BaseActivity {
             model.setSource("####" + i);
             model.setType(type);
             mData.add(model);
-        }
+        }*/
         mAdapter = new BussinessDetailAdapter(this, mData);
         mlist.setAdapter(mAdapter);
 
@@ -152,6 +169,7 @@ public class BusinessDetailActivty extends BaseActivity {
             } else {
                 holder = (ViewHolder) convertView.getTag();
             }
+            holder.bc_id=mdata.get(position).getBc_id();
             holder.type = mdata.get(position).getType();
             holder.tv_num.setText(mdata.get(position).getNum());
             holder.tv_name.setText(mdata.get(position).getName());
@@ -170,6 +188,7 @@ public class BusinessDetailActivty extends BaseActivity {
                 holder.bt_event.setVisibility(View.VISIBLE);
                 holder.bt_event.setText("分配");
             }
+           // holder.tv_date.setText(mdata.get(position).getDate());
             holder.bt_event.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -185,6 +204,7 @@ public class BusinessDetailActivty extends BaseActivity {
 
 
         class ViewHolder {
+            int bc_id;
             TextView tv_num;
             TextView tv_name;
             TextView tv_leader;
@@ -197,4 +217,62 @@ public class BusinessDetailActivty extends BaseActivity {
             int type;
         }
     }
+
+
+    private Handler mHandler=new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what){
+                case Constants.HTTP_SUCCESS_INIT:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    formCondition=JSON.parseObject(msg.getData().getString("result")).getString("keyField");
+                    gridCondition=JSON.parseObject(msg.getData().getString("result")).getString("pfField");
+                    JSONArray array= JSON.parseObject(msg.getData().getString("result")).getJSONArray("listdata");
+                    if(!array.isEmpty()){
+                        for (int i=0;i<array.size();i++){
+                            Business model=new Business();
+                            model.setNum(array.getJSONObject(i).getString("bc_code"));
+                            model.setDate(array.getJSONObject(i).getString("bc_recorddate"));
+                            model.setName(array.getJSONObject(i).getString("bc_description"));
+                            model.setPhone(array.getJSONObject(i).getString("bc_tel"));
+                            model.setNote(array.getJSONObject(i).getString("bc_remark"));
+                            model.setSource(array.getJSONObject(i).getString("bc_from"));
+                            model.setBc_id(array.getJSONObject(i).getInteger("bc_id"));
+                            model.setType(type);
+                            mData.add(model);
+                        }
+                    }
+//                    "bc_tel":"",
+//                        "bc_code":"2016050004",
+//                        "bc_remark":"",
+//                        "bc_recorddate":"2016-05-24 00:00:00",
+//                        "bc_description":"测试",
+//                        "bc_from":"",
+//                        "bc_id":730
+                    mAdapter = new BussinessDetailAdapter(ct, mData);
+                    mlist.setAdapter(mAdapter);
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+
+                    break;
+            }
+        }
+    };
+
+    private void sendHttpResquest(int what,int page){
+        progressDialog.show();
+        String url= Constants.getAppBaseUrl(ct)+"mobile/common/list.action";
+        Map<String,Object> params=new HashMap<>();
+        if (page==1)mData.clear();
+        params.put("page", page);
+        params.put("pageSize", 10);
+        params.put("caller","BusinessChance");
+        params.put("condition", "1=1");
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessDetailInfoActivity.java

@@ -4,6 +4,8 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
+import android.os.Handler;
+import android.os.Message;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
@@ -18,20 +20,25 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.SimpleAdapter;
+import android.widget.TextView;
 
 import com.afollestad.materialdialogs.GravityEnum;
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 import com.xzjmyk.pm.activity.view.steps.StepsView;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -43,6 +50,10 @@ import java.util.Map;
  */
 public class BusinessDetailInfoActivity extends BaseActivity implements View.OnClickListener {
 
+    @ViewInject(R.id.bt_fenpei)
+    private Button bt_fenpei;
+    @ViewInject(R.id.bt_qiang)
+    private Button bt_qiang;
     @ViewInject(R.id.bt_manage_date)
     private Button bt_manage_date;
     @ViewInject(R.id.bt_manage_go)
@@ -55,6 +66,23 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     @ViewInject(R.id.crm_ll_manage)
     private LinearLayout crm_ll_manage;
 
+    @ViewInject(R.id.bc_from)
+    private TextView bc_from;
+    @ViewInject(R.id.bc_phone)
+    private TextView bc_phone;
+    @ViewInject(R.id.bc_remark)
+    private TextView bc_remark;
+    @ViewInject(R.id.bc_state)
+    private TextView bc_state;
+    @ViewInject(R.id.bc_name)
+    private TextView bc_name;
+    @ViewInject(R.id.bc_recorder)
+    private TextView bc_recorder;
+    @ViewInject(R.id.bc_recorddate)
+    private TextView bc_recorddate;
+    @ViewInject(R.id.bc_recorddate_update)
+    private TextView bc_recorddate_update;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -65,13 +93,18 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     }
 
     private int type = 0;
-
+    private String formCondition;
+    private String gridCondition;
     private void initView() {
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("商机详情");
         Intent intent = getIntent();
         if (intent != null) {
             type = intent.getIntExtra("type", 0);
+            formCondition=intent.getStringExtra("formCondition");
+            gridCondition=intent.getStringExtra("gridCondition");
+            Log.i(TAG, "initView:" + formCondition );
+            Log.i(TAG, "initView:" +  gridCondition );
         }
         switch (type) {
             case 0:
@@ -98,10 +131,12 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
     private void initListener() {
         bt_manage_date.setOnClickListener(this);
         bt_manage_go.setOnClickListener(this);
+        bt_qiang.setOnClickListener(this);
+        bt_fenpei.setOnClickListener(this);
     }
 
     private void initData() {
-
+        sendHttpResquest(Constants.HTTP_SUCCESS_INIT,formCondition,gridCondition);
     }
 
     @Override
@@ -111,6 +146,12 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                 showPopupWindow(v.findViewById(R.id.bt_manage_go));
                 break;
             case R.id.bt_manage_date:
+                break;
+            case R.id.bt_qiang:
+                sendHttpBusinessQiang(BUSINESS_QIANG,bt_code,bt_doman);
+                break;
+            case R.id.bt_fenpei:
+
                 break;
         }
     }
@@ -199,5 +240,70 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
         return list;
     }
 
+    private final  int BUSINESS_QIANG=2;
+    private String bt_doman;//跟进人
+    private String bt_code;//编号
+
+    private Handler mHandler=new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what){
+                case Constants.HTTP_SUCCESS_INIT:
+                    progressDialog.dismiss();
+//                    "bc_code":"2016050004",
+//                        "bc_recorder":"邓国超",
+//                        "bc_recorddate":"2016-05-24 00:00:00",
+//                        "bc_from":"",
+//                        "bc_nichehouse":"",
+//                        "bc_lastdate":"",
+//                        "bc_doman":"黄耀鹏",
+//                        "bc_remark":""
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    JSONObject root= JSON.parseObject(msg.getData().getString("result")).getJSONObject("panelData");
+                    bc_from.setText(root.getString("bc_from"));
+                    bc_name.setText(root.getString("bc_nichehouse"));
+                    bc_phone.setText("无");
+                    bc_recorddate.setText(root.getString("bc_recorddate"));
+                    bc_recorddate_update.setText(root.getString("bc_lastdate"));
+                    bc_recorder.setText(root.getString("bc_recorder"));
+                    bc_remark.setText(root.getString("bc_remark"));
+                    bc_state.setText("已分配");
+                    bt_doman=root.getString("bc_doman");
+                    bt_code=root.getString("bt_code");
+                    break;
+                case BUSINESS_QIANG:
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+                    ViewUtil.ToastMessage(ct,msg.getData().getString("result"));
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
 
+                    break;
+            }
+        }
+    };
+
+    private void sendHttpResquest(int what,String formCondition,String gridCondition){
+        progressDialog.show();
+        String url= Constants.getAppBaseUrl(ct)+"mobile/common/getPanel.action";
+        Map<String,Object> params=new HashMap<>();
+        params.put("caller", "BusinessChance");
+        params.put("formCondition", formCondition);
+        params.put("gridCondition", gridCondition);
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
+    }
+
+    private void sendHttpBusinessQiang(int what,String bc_code,String bc_doman){
+        progressDialog.show();
+        String url= Constants.getAppBaseUrl(ct)+"mobile/crm/updateBusinessChanceDoman.action";
+        Map<String,Object> params=new HashMap<>();
+        params.put("bc_code", bc_code);
+        params.put("bc_doman", bc_doman);
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ClientActivity.java

@@ -243,8 +243,6 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
     }
 
 
-
-
     private Handler mHandler=new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -258,9 +256,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
             }
         }
     };
-    //url,param,get,header,handler,
+
     private void sendHttpResquest(){
-        progressDialog.setMessage("初始化数据...");
         progressDialog.show();
         String url= Constants.getAppBaseUrl(ct)+"";
         Map<String,Object> params=new HashMap<>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/ContactManAddActivity.java

@@ -0,0 +1,15 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.crm;
+
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+public class ContactManAddActivity extends BaseActivity{
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_contact_man_add);
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerDetailActivity.java

@@ -3,6 +3,9 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -10,8 +13,15 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.view.steps.StepsView;
 
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 /**
  * @功能:客户详情
  * @author:Arisono
@@ -44,6 +54,8 @@ public class CustomerDetailActivity extends BaseActivity {
     }
 
     private void initData() {
+        sendHttpResquest(Constants.HTTP_SUCCESS_INIT);
+        sendAdd(Constants.HTTP_SUCCESS_INIT);
         mStepsView.setCompletedPosition(5 % labels.length)
                 .setLabels(labels)
                 .setBarColorIndicator(
@@ -71,4 +83,47 @@ public class CustomerDetailActivity extends BaseActivity {
         }
         return true;
     }
+
+
+    private Handler mHandler=new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what){
+                case Constants.HTTP_SUCCESS_INIT:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+
+                    break;
+            }
+        }
+    };
+
+    private void sendHttpResquest(int what){
+        progressDialog.show();
+        String url= Constants.getAppBaseUrl(ct)+"mobile/crm/getCustomerbycode.action";
+        Map<String,Object> params=new HashMap<>();
+        params.put("cu_code", "A00000333");
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
+    }
+
+    public static String formStore="{\"ct_name\":\"wang二\",\"ct_sex\":\"男\",\"ct_cuname\":\"12\",\"ct_dept\":\"研发部\",\"ct_position\":\"工程师\",\"ct_officephone\":\"1132213\",\"ct_mobile\":\"13266699268\",\"ct_personemail\":\"728437832@qq.com\",\"ct_address\":\"深圳市\",\"ct_birthday\":\"1990-08-11\",\"ct_reamrk\":\"似懂非懂\",\"ct_attach\":\"12\"}";
+    private void sendAdd(int what){
+        progressDialog.show();
+        String url= Constants.getAppBaseUrl(ct)+"mobile/crm/getCustomerbycode.action";
+        Map<String,Object> params=new HashMap<>();
+        params.put("formStore", formStore);
+        params.put("caller", "Contact");
+        params.put("param", "");
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
+    }
+
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerListActivity.java

@@ -4,6 +4,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -26,10 +29,14 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.crm.Business;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -93,6 +100,7 @@ public class CustomerListActivity extends BaseActivity {
     }
 
     private void initData() {
+        sendHttpResquest(Constants.HTTP_SUCCESS_INIT);
         for (int i = 0; i < 22; i++) {
             Business model = new Business();
             model.setNum("013223" + i);
@@ -284,4 +292,39 @@ public class CustomerListActivity extends BaseActivity {
 
         return list;
     }
+
+
+    private Handler mHandler=new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what){
+                case Constants.HTTP_SUCCESS_INIT:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+
+                    break;
+            }
+        }
+    };
+
+    private void sendHttpResquest(int what){
+        progressDialog.show();
+        String url= Constants.getAppBaseUrl(ct)+"/mobile/crm/getCustomerDetail.action";
+        Map<String,Object> params=new HashMap<>();
+        params.put("emcode", CommonUtil.getSharedPreferences(ct,"erp_username"));
+        params.put("page", "1");
+        params.put("pageSize", "10");
+        params.put("type", "2");
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
+    }
+
+
+
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/SalesRankingActivity.java

@@ -3,6 +3,9 @@ package com.xzjmyk.pm.activity.ui.erp.activity.crm;
 import android.content.Context;
 import android.os.Bundle;
 
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -20,11 +23,17 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.crm.Business;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * @功能:荣誉墙，销售排行榜
@@ -55,6 +64,7 @@ public class SalesRankingActivity extends BaseActivity {
     }
 
     private void initData() {
+        sendHttpResquest(Constants.HTTP_SUCCESS_INIT);
         for (int i = 0; i < 22; i++) {
             Business model = new Business();
             model.setNum("013223" + i);
@@ -162,4 +172,35 @@ public class SalesRankingActivity extends BaseActivity {
         }
     }
 
+
+
+    private Handler mHandler=new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what){
+                case Constants.HTTP_SUCCESS_INIT:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    progressDialog.dismiss();
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
+
+                    break;
+            }
+        }
+    };
+
+    private void sendHttpResquest(int what){
+        progressDialog.show();
+        String url= Constants.getAppBaseUrl(ct)+"mobile/crm/getRankList.action";
+        Map<String,Object> params=new HashMap<>();
+        params.put("condition", "and to_char(pi_date,'yyyymm')=201607");
+        LinkedHashMap<String , Object> headers=new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, what, null, null, "post");
+    }
+
+
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/DateFormatUtil.java

@@ -135,6 +135,20 @@ public class DateFormatUtil {
 		return c.get(Calendar.MONTH)+1;
 	}
 
+	// 获得本月第一天0点时间
+	public static Date getTimesMonthmorning() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+		cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+		return cal.getTime();
+	}
+
+	public static Date getLastMonthStartMorning() {
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(getTimesMonthmorning());
+		cal.add(Calendar.MONTH, -1);
+		return cal.getTime();
+	}
 	/**
 	 * <p>获取当前日</p>
 	 *
@@ -856,5 +870,105 @@ public class DateFormatUtil {
 		System.out.println(getCurrentDay());
 		
 	}
-	
+	public static Date getPreYearStartTime() {
+		Calendar cal = Calendar.getInstance();
+		cal.add(Calendar.YEAR, -1);
+		cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+		cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.YEAR));
+		return cal.getTime();
+	}
+
+	public static Date getCurrentYearStartTime() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+		cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.YEAR));
+		return cal.getTime();
+	}
+
+	/**
+	 * 当前季度的结束时间，即2012-03-31 23:59:59
+	 *
+	 * @return
+	 */
+	public static Date getCurrentQuarterEndTime() {
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(getCurrentQuarterStartTime());
+		cal.add(Calendar.MONTH, 3);
+		return cal.getTime();
+	}
+
+	/**
+	 * 前季度的结束时间，即2012-03-31 23:59:59
+	 *
+	 * @return
+	 */
+	public static Date getPreQuarterEndTime() {
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(getPreQuarterStartTime());
+		cal.add(Calendar.MONTH, 3);
+		return cal.getTime();
+	}
+
+	/**
+	 * 当前季度的开始时间，即2012-03-31 23:59:59
+	 *
+	 * @return
+	 */
+	public static Date getCurrentQuarterStartTime() {
+		Calendar c = Calendar.getInstance();
+		// c.add(Calendar.MONTH, -3);
+		int currentMonth = c.get(Calendar.MONTH)+1 ;
+		System.out.println("currentMoth"+currentMonth);
+		SimpleDateFormat longSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat shortSdf = new SimpleDateFormat("yyyy-MM-dd");
+		Date now = null;
+		try {
+			if (currentMonth >= 1 && currentMonth <= 3)
+				c.set(Calendar.MONTH, 0);
+			else if (currentMonth >= 4 && currentMonth <= 6)
+				c.set(Calendar.MONTH, 3);
+			else if (currentMonth >= 7 && currentMonth <= 9)
+			{c.set(Calendar.MONTH, 6);
+				System.out.println(new SimpleDateFormat("yyyyMM").format(c.getTime()));
+			}else if (currentMonth >= 10 && currentMonth <= 12)
+				c.set(Calendar.MONTH, 9);
+			c.set(Calendar.DATE, 1);
+			now = longSdf.parse(shortSdf.format(c.getTime()) + " 00:00:00");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return now;
+	}
+
+	/**
+	 * 前季度的开始时间，即2012-03-31 23:59:59
+	 *
+	 * @return
+	 */
+	public static Date getPreQuarterStartTime() {
+		Calendar c = Calendar.getInstance();
+		 c.add(Calendar.MONTH, -3);
+		int currentMonth = c.get(Calendar.MONTH)+1 ;
+		System.out.println("currentMoth"+currentMonth);
+		SimpleDateFormat longSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat shortSdf = new SimpleDateFormat("yyyy-MM-dd");
+		Date now = null;
+		try {
+			if (currentMonth >= 1 && currentMonth <= 3)
+				c.set(Calendar.MONTH, 0);
+			else if (currentMonth >= 4 && currentMonth <= 6)
+				c.set(Calendar.MONTH, 3);
+			else if (currentMonth >= 7 && currentMonth <= 9)
+			{c.set(Calendar.MONTH, 6);
+				System.out.println(new SimpleDateFormat("yyyyMM").format(c.getTime()));
+			}else if (currentMonth >= 10 && currentMonth <= 12)
+				c.set(Calendar.MONTH, 9);
+			c.set(Calendar.DATE, 1);
+			now = longSdf.parse(shortSdf.format(c.getTime()) + " 00:00:00");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return now;
+	}
+
 }

WeiChat/src/main/res/layout/act_list_single_view.xml

@@ -21,7 +21,7 @@
     <ListView
         android:id="@+id/lv_master"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="300dp"
         android:visibility="gone" >
     </ListView>
     <LinearLayout
@@ -68,7 +68,16 @@
             android:gravity="center"
             android:text="确定"
             android:textColor="@color/lightblack"
-            android:textSize="16.0dip" />
+            android:textSize="16.0dip" />
+
+
+
+
+
+
+
+
+
         -->
     </LinearLayout>
 </LinearLayout>

WeiChat/src/main/res/layout/activity_business.xml

@@ -25,7 +25,7 @@
             android:id="@+id/inc_grid"
             android:layout_below="@+id/ll_funnel"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             layout="@layout/inculde_grid_view"></include>
 
         <LinearLayout

WeiChat/src/main/res/layout/activity_business_add.xml

@@ -18,7 +18,7 @@
             android:orientation="vertical">
 
             <RelativeLayout
-                android:id="@+id/ry_leave_man"
+                android:id="@+id/ry_business_no"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color1">
 
@@ -31,7 +31,7 @@
                     android:textSize="@dimen/text_main" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/et_leave_man"
+                    android:id="@+id/et_business_no"
                     style="@style/form_relative_right_text"
                     editTextFormExample:testType="nocheck" />
             </RelativeLayout>
@@ -39,7 +39,7 @@
             <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
             <RelativeLayout
-                android:id="@+id/ry_leave_mankind"
+                android:id="@+id/ry_business_name"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color2">
 
@@ -52,7 +52,7 @@
                     android:textSize="@dimen/text_main" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/et_leave_mankind"
+                    android:id="@+id/et_business_name"
                     style="@style/form_relative_right_text"
                     editTextFormExample:testType="nocheck" />
             </RelativeLayout>
@@ -78,7 +78,7 @@
             <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
             <RelativeLayout
-                android:id="@+id/ry_leave_category"
+                android:id="@+id/ry_business_source"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color1">
 
@@ -91,7 +91,7 @@
                     android:textSize="@dimen/text_main" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/et_leave_category"
+                    android:id="@+id/et_business_source"
                     style="@style/form_relative_right_text"
                     editTextFormExample:testType="nocheck" />
             </RelativeLayout>
@@ -99,7 +99,7 @@
             <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
             <RelativeLayout
-                android:id="@+id/ry_set_website"
+                android:id="@+id/ry_business_phone"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color2">
 
@@ -112,7 +112,7 @@
                     android:textSize="@dimen/text_main" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/et_leave_days"
+                    android:id="@+id/et_business_phone"
                     style="@style/form_relative_right_text"
                     whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
                     whatever:testErrorString="@string/error_only_numeric_digits_allowed"
@@ -122,7 +122,7 @@
             <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
             <RelativeLayout
-                android:id="@+id/ry_leave_hours"
+                android:id="@+id/ry_business_createTime"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color1">
 
@@ -136,9 +136,8 @@
                     android:textSize="@dimen/text_main" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/et_leave_hours"
+                    android:id="@+id/et_business_createTime"
                     style="@style/form_relative_right_text"
-
                     whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
                     whatever:testErrorString="@string/error_only_numeric_digits_allowed"
                     whatever:testType="regexp" />
@@ -147,7 +146,7 @@
             <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
             <RelativeLayout
-                android:id="@+id/ry_leave_reason"
+                android:id="@+id/ry_business"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color2">
 
@@ -160,14 +159,14 @@
                     android:textSize="@dimen/text_main" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/et_leave_reason"
+                    android:id="@+id/et_business"
                     style="@style/form_relative_right_text"
                     editTextFormExample:testType="nocheck" />
             </RelativeLayout>
 
 
             <RelativeLayout
-                android:id="@+id/ry_set_startTime"
+                android:id="@+id/ry_business_jieDuan"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color1">
 
@@ -180,7 +179,7 @@
                     android:textSize="@dimen/text_main" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/tv_start_time"
+                    android:id="@+id/et_business_jieDuan"
                     style="@style/form_relative_right_text"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="date" />
@@ -188,7 +187,7 @@
 
 
             <RelativeLayout
-                android:id="@+id/ry_set_endTime"
+                android:id="@+id/ry_business_enterTime"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color2">
 
@@ -199,12 +198,14 @@
                     android:textSize="@dimen/text_main" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/et_business_enterTime"
                     style="@style/form_relative_right_text"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="date" />
             </RelativeLayout>
 
             <RelativeLayout
+                android:id="@+id/ry_business_enterMan"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color1">
 
@@ -217,14 +218,14 @@
                     android:textSize="@dimen/text_main" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-
+                    android:id="@+id/et_business_enterMan"
                     style="@style/form_relative_right_text"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="date" />
             </RelativeLayout>
 
             <RelativeLayout
-
+                android:id="@+id/ry_company_name"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color2">
 
@@ -236,13 +237,14 @@
                     android:textSize="@dimen/text_main" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-
+                    android:id="@+id/et_company_name"
                     style="@style/form_relative_right_text"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="date" />
             </RelativeLayout>
 
             <RelativeLayout
+                android:id="@+id/ry_company_address"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color1">
 
@@ -255,7 +257,7 @@
                     android:textSize="@dimen/text_main" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-
+                    android:id="@+id/et_company_address"
                     style="@style/form_relative_right_text"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="date" />
@@ -263,7 +265,7 @@
 
 
             <RelativeLayout
-
+                android:id="@+id/ry_company_man"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color2">
 
@@ -275,13 +277,14 @@
                     android:textSize="@dimen/text_main" />
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-
+                    android:id="@+id/et_company_man"
                     style="@style/form_relative_right_text"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="date" />
             </RelativeLayout>
 
             <RelativeLayout
+                android:id="@+id/ry_company_position"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color1">
 
@@ -293,8 +296,9 @@
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
-                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/tv_note_value"
+                <com.andreabaccega.widget.FormEditText
+                    xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/et_company_position"
                     style="@style/form_relative_right_text"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="date" />
@@ -302,7 +306,7 @@
 
 
             <RelativeLayout
-
+                android:id="@+id/ry_company_tele"
                 style="@style/form_relative_customer"
                 android:background="@color/item_color2">
 
@@ -313,8 +317,9 @@
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 
-                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                    android:id="@+id/tv_end_time"
+                <com.andreabaccega.widget.FormEditText
+                    xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                    android:id="@+id/et_company_tele"
                     style="@style/form_relative_right_text"
                     editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                     editTextFormExample:testType="date" />

WeiChat/src/main/res/layout/activity_business_detail_info.xml

@@ -139,7 +139,8 @@
                 <TextView
                     android:layout_marginLeft="5dp"
                     android:text="会议销售"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:id="@+id/bc_from" />
             </LinearLayout>
 
             <LinearLayout
@@ -156,7 +157,8 @@
                 <TextView
                     android:layout_marginLeft="5dp"
                     android:text="158********"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:id="@+id/bc_phone" />
             </LinearLayout>
 
             <LinearLayout
@@ -173,7 +175,8 @@
                 <TextView
                     android:layout_marginLeft="5dp"
                     android:text="行业交流大会,****************************************"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:id="@+id/bc_remark" />
             </LinearLayout>
         </LinearLayout>
 
@@ -213,7 +216,8 @@
                 <TextView
                     android:layout_marginLeft="5dp"
                     android:text="已分配"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:id="@+id/bc_state" />
             </LinearLayout>
 
             <LinearLayout
@@ -230,7 +234,8 @@
                 <TextView
                     android:layout_marginLeft="5dp"
                     android:text="深圳商机库"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:id="@+id/bc_name" />
             </LinearLayout>
 
             <LinearLayout
@@ -247,7 +252,8 @@
                 <TextView
                     android:layout_marginLeft="5dp"
                     android:text="***"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:id="@+id/bc_recorder" />
             </LinearLayout>
 
             <LinearLayout
@@ -264,7 +270,8 @@
                 <TextView
                     android:layout_marginLeft="5dp"
                     android:text="2016-06-27 14:43"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:id="@+id/bc_recorddate" />
             </LinearLayout>
 
             <LinearLayout
@@ -281,7 +288,8 @@
                 <TextView
                     android:layout_marginLeft="5dp"
                     android:text="2016-06-27 14:43"
-                    style="@style/TextView_VerticalCenter" />
+                    style="@style/TextView_VerticalCenter"
+                    android:id="@+id/bc_recorddate_update" />
             </LinearLayout>
         </LinearLayout>
 
@@ -314,6 +322,7 @@
                 android:weightSum="2">
 
                 <Button
+                    android:id="@+id/bt_qiang"
                     android:layout_weight="1"
                     android:text="抢"
                     style="@style/crm_business_btn_nomargin" />
@@ -328,6 +337,7 @@
                 android:weightSum="2">
 
                 <Button
+                    android:id="@+id/bt_fenpei"
                     android:layout_weight="1"
                     android:text="分配"
                     style="@style/crm_business_btn_nomargin" />

WeiChat/src/main/res/layout/activity_contact_man_add.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.crm.ContactManAddActivity">
+
+</RelativeLayout>

WeiChat/src/main/res/layout/activity_customter_add.xml

@@ -77,7 +77,6 @@
             style="@style/form_relative_customer"
             android:background="@color/item_color1">
 
-
             <TextView
                 android:id="@+id/tv_leave_category"
                 style="@style/form_relative_left_text"