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

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

@@ -317,23 +317,27 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     JSONArray receivables = root.getJSONArray("receivables");
                     JSONArray profits = root.getJSONArray("profits");
                     if (sales != null) {
-                        if (sales.size() != 2) {
-                            //__元/第__名   第一名:__金额:__元
-                            tv_rank_sale_left.setText(sales.getJSONArray(0).getIntValue(0) + "元/第1名");
-                            tv_rank_sale_right.setText("第一名:" + sales.getJSONArray(0).getString(1)
-                                    + "金额:" + sales.getJSONArray(0).getIntValue(0) + "元");
+                        if (!sales.isEmpty()){
+                            if (sales.size() != 2) {
+                                //__元/第__名   第一名:__金额:__元
+                                tv_rank_sale_left.setText(sales.getJSONArray(0).getIntValue(0) + "元/第1名");
+                                tv_rank_sale_right.setText("第一名:" + sales.getJSONArray(0).getString(1)
+                                        + "金额:" + sales.getJSONArray(0).getIntValue(0) + "元");
 //                            sales.getJSONArray(0).getIntValue(0);//第一名  元
 //                            sales.getJSONArray(0).getString(1);//第一名
-                        } else {
-                            tv_rank_sale_left.setText(sales.getJSONArray(1).getIntValue(0) + "元/第1名");
-                            tv_rank_sale_right.setText("第一名:" + sales.getJSONArray(0).getString(1)
-                                    + "金额:" + sales.getJSONArray(1).getIntValue(0) + "元");
-                            sales.getJSONArray(1).getIntValue(0);//自己  元
-                            sales.getJSONArray(1).getString(1);//自己
+                            } else {
+                                tv_rank_sale_left.setText(sales.getJSONArray(1).getIntValue(0) + "元/第1名");
+                                tv_rank_sale_right.setText("第一名:" + sales.getJSONArray(0).getString(1)
+                                        + "金额:" + sales.getJSONArray(1).getIntValue(0) + "元");
+                                sales.getJSONArray(1).getIntValue(0);//自己  元
+                                sales.getJSONArray(1).getString(1);//自己
+                            }
                         }
+                   
                     }
 
-                    if (visits != null) {
+                    if (visits != null&&!visits.isEmpty()) {
+                        
                         if (visits.size() != 2) {
                             //名称 拜访次数，拜访个数，排名
                             tv_rank_visit_left.setText(visits.getJSONArray(0).getIntValue(2) + "个/" +
@@ -360,7 +364,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         }
                     }
 
-                    if (profits != null) {
+                    if (profits != null&&!profits.isEmpty()) {
                         if (profits.size() == 2) {
                             tv_rank_rirun_left.setText(profits.getJSONArray(1).getIntValue(0) + "元/第1名");
                             tv_rank_rirun_right.setText("第一名:" + profits.getJSONArray(1).getString(1)
@@ -379,7 +383,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     }
 
 
-                    if (receivables != null) {
+                    if (receivables != null&&!receivables.isEmpty()) {
                         if (receivables.size() == 2) {
                             tv_rank_income_left.setText(receivables.getJSONArray(1).getIntValue(0) + "元/第1名");
                             tv_rank_income_right.setText("第一名:" + receivables.getJSONArray(1).getString(1)
@@ -416,14 +420,17 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     progressDialog.dismiss();
                     Log.i(TAG, "handleMessage Targets:" + msg.getData().getString("result"));
                     root = JSON.parseObject(msg.getData().getString("result")).getJSONObject("datas");
-                    JSONObject target = root.getJSONArray("target").getJSONObject(0);
-                    tv_em_name.setText(target.getString("EM_CODE"));
-                    tv_em_name.setText(target.getString("CUSTOMERCOUNT"));
-                    tv_em_depart.setText(target.getString("BFCOUNT"));
-                    tv_em_plan.setText(target.getIntValue("RANK")+"");
-                    tv_em_sale.setText(target.getIntValue("FIRSTBFCOUNT")+"");
-                    tv_em_planrirun.setText(target.getIntValue("TOPCOUNT")+"");
-                    tv_em_rirun.setText(target.getIntValue("ACTUALPROFIT")+"");
+                    if(!root.getJSONArray("target").isEmpty()){
+                        JSONObject target = root.getJSONArray("target").getJSONObject(0);
+                        tv_em_name.setText(target.getString("EM_CODE"));
+                        tv_em_name.setText(target.getString("CUSTOMERCOUNT"));
+                        tv_em_depart.setText(target.getString("BFCOUNT"));
+                        tv_em_plan.setText(target.getIntValue("RANK")+"");
+                        tv_em_sale.setText(target.getIntValue("FIRSTBFCOUNT")+"");
+                        tv_em_planrirun.setText(target.getIntValue("TOPCOUNT")+"");
+                        tv_em_rirun.setText(target.getIntValue("ACTUALPROFIT")+"");
+                    }
+                   
 //                    "EM_CODE":"A021",
 //                        "CUSTOMERCOUNT":"陈虎",
 //                        "BFCOUNT":"财务部",

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

@@ -26,11 +26,13 @@ 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.DateFormatUtil;
 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.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -64,7 +66,8 @@ public class SalesRankingActivity extends BaseActivity {
     }
 
     private void initData() {
-        sendHttpResquest(Constants.HTTP_SUCCESS_INIT);
+        sendHttpResquest(Constants.HTTP_SUCCESS_INIT,DateFormatUtil.getStrDate4Date(new Date(),
+                "yyyyMM"));
         for (int i = 0; i < 22; i++) {
             Business model = new Business();
             model.setNum("013223" + i);
@@ -90,7 +93,10 @@ public class SalesRankingActivity extends BaseActivity {
         getMenuInflater().inflate(R.menu.main_sale_ranking, menu);
         return true;
     }
-
+    /**
+      * @desc:日历类
+      * @author：Arison on 2016/8/1
+      */
     private Calendar calendar = Calendar.getInstance();
 
     @Override
@@ -106,7 +112,7 @@ public class SalesRankingActivity extends BaseActivity {
                 picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
                     @Override
                     public void onDatePicked(String year, String month, String day) {
-                        ToastUtil.showToast(ct, year + "-" + month + "-" + day);
+                        sendHttpResquest(Constants.HTTP_SUCCESS_INIT,year+month);
                     }
                 });
                 picker.show();
@@ -192,11 +198,11 @@ public class SalesRankingActivity extends BaseActivity {
         }
     };
 
-    private void sendHttpResquest(int what){
+    private void sendHttpResquest(int what,String date){
         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");
+        params.put("condition", "and to_char(pi_date,'yyyymm')="+ date);
         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/oa/alarmreceiver.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AlarmReceiver.java

@@ -15,7 +15,10 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.util.Calendar;
-
+/**
+ *AlarmReceiver
+ *
+ */
 public class AlarmReceiver extends BroadcastReceiver {
 
     @Override