更改Crm主界面若干字段界面

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

@@ -400,6 +400,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
                         }else{
                             Intent intent = new Intent(ct, TaskAddActivity.class);
                             intent.putExtra("type", 1);
+                            intent.putExtra("from","BusinessDetailInfo");
                             intent.putExtra("data", bt_code);
                             startActivityForResult(intent, 0x11);
                         }

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

@@ -246,7 +246,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         leftAxis.setDrawGridLines(false);
         leftAxis.setSpaceTop(25f);
         leftAxis.setAxisMinValue(0f);
-        leftAxis.setAxisMaxValue(100f);
+//        leftAxis.setAxisMaxValue(100f);
         leftAxis.setAxisLineColor(getResources().getColor(R.color.red));
         mChart.getAxisRight().setEnabled(false);
         mChart.getAxisLeft().setEnabled(true);
@@ -312,7 +312,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         leftAxis.setDrawGridLines(false);
         leftAxis.setSpaceTop(25f);
         leftAxis.setAxisMinValue(0f);
-        leftAxis.setAxisMaxValue(100f);
+//        leftAxis.setAxisMaxValue(100f);
         leftAxis.setAxisLineColor(getResources().getColor(R.color.red));
         sChart.getAxisRight().setEnabled(false);
         sChart.getAxisLeft().setEnabled(true);
@@ -407,11 +407,16 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
             }
             @Override
             public String getFormattedValue(float value) {
-                if (value==0){
-                    return "0";
-                }else {
-                    return mFormat.format(value);
+                try {
+                    if (value==0){
+                        return "0";
+                    }else {
+                        return mFormat.format(value);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
+                return  "";
             }
         });
         dataSets.clear();
@@ -535,26 +540,38 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     if (sales != null) {
                         if (!sales.isEmpty()){
                             if (sales.size() != 2) {
-                                //__元/第__名   第一名:__金额:__元
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
                                          "NO."+"__"+"\n￥__",
                                         new String[]{"__"},ct.getResources().getColor(R.color.gray)
                                         );
                                 CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
-                                        "NO.1:" + sales.getJSONArray(0).getString(1)
+                                        "NO." + sales.getJSONArray(0).getIntValue(2)
+                                                + ":" + sales.getJSONArray(0).getString(1)
                                                 + "\n￥" + sales.getJSONArray(0).get(0) + ""
-                                        , new String[]{sales.getJSONArray(0).getString(1),
+                                        , new String[]{
+                                                String.valueOf(sales.getJSONArray(0).getIntValue(2)),
+                                                sales.getJSONArray(0).getString(1),
                                                 String.valueOf(sales.getJSONArray(0).get(0))},
                                         ct.getResources().getColor(R.color.gray));
-//                                tv_rank_sale_right.setText("第一名:" + sales.getJSONArray(0).getString(1)
-//                                        + "金额:" + sales.getJSONArray(0).getIntValue(0) + "元");
-                
                             } else {
-                                tv_rank_sale_left.setText("NO.1\n"+"￥"+sales.getJSONArray(1).get(0));
-                                tv_rank_sale_right.setText("NO._:" + sales.getJSONArray(0).getString(1)
-                                        + "\n￥" + sales.getJSONArray(1).get(0) + "");
-                                sales.getJSONArray(1).get(0);//自己  元
-                                sales.getJSONArray(1).getString(1);//自己
+                                CommonUtil.textAarrySpanForStyle(tv_rank_sale_left,
+                                        "NO." + sales.getJSONArray(1).getIntValue(2)
+                                                + ":" + sales.getJSONArray(1).getString(1)
+                                                + "\n￥" + sales.getJSONArray(1).get(0) + ""
+                                        , new String[]{
+                                                String.valueOf(sales.getJSONArray(1).getIntValue(2)),
+                                                sales.getJSONArray(1).getString(1),
+                                                String.valueOf(sales.getJSONArray(1).get(0))},
+                                        ct.getResources().getColor(R.color.gray));
+                                CommonUtil.textAarrySpanForStyle(tv_rank_sale_right,
+                                        "NO." + sales.getJSONArray(0).getIntValue(2)
+                                                + ":" + sales.getJSONArray(0).getString(1)
+                                                + "\n￥" + sales.getJSONArray(0).get(0) + ""
+                                        , new String[]{
+                                                String.valueOf(sales.getJSONArray(0).getIntValue(2)),
+                                                sales.getJSONArray(0).getString(1),
+                                                String.valueOf(sales.getJSONArray(0).get(0))},
+                                        ct.getResources().getColor(R.color.gray));
                             }
                         }
                    
@@ -601,21 +618,35 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
                     if (profits != null&&!profits.isEmpty()) {
                         if (profits.size() == 2) {
-                            tv_rank_rirun_left.setText("NO:"+"__"+"\n￥__");
-                            tv_rank_rirun_right.setText("NO1:" + profits.getJSONArray(1).getString(1)
-                                    + "\n￥" + profits.getJSONArray(1).get(0));
-                            profits.getJSONArray(1).get(0);//第一名  元
-                            profits.getJSONArray(1).getString(1);//第一名
-                            profits.getJSONArray(1).getIntValue(2);//第一名  元
+                            CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
+                                    "NO."+profits.getJSONArray(1).getIntValue(2)+":" 
+                                            + profits.getJSONArray(1).getString(1)
+                                            + "\n￥" + profits.getJSONArray(1).get(0) + " "
+                                    , new String[]{
+                                            String.valueOf(profits.getJSONArray(1).getIntValue(2)),
+                                            profits.getJSONArray(1).getString(1),
+                                            String.valueOf(profits.getJSONArray(1).get(0))
+                                    }, ct.getResources().getColor(R.color.gray));
+                            CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,
+                                    "NO." + profits.getJSONArray(0).getIntValue(2)
+                                            + ":" + profits.getJSONArray(0).getString(1)
+                                            + "\n￥" + profits.getJSONArray(0).get(0) + " "
+                                    , new String[]{
+                                            String.valueOf(profits.getJSONArray(0).getIntValue(2)),
+                                            profits.getJSONArray(0).getString(1),
+                                            String.valueOf(profits.getJSONArray(0).get(0))
+                                    }, ct.getResources().getColor(R.color.gray));
                         } else {
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_left,
                                     "NO.__"+"\n￥"+"__",
                                     new String[]{
                                             "__","__"},ct.getResources().getColor(R.color.gray));
                             CommonUtil.textAarrySpanForStyle(tv_rank_rirun_right,
-                                    "NO.1:" + profits.getJSONArray(0).getString(1)
+                                    "NO." + profits.getJSONArray(0).getIntValue(2)
+                                            + ":" + profits.getJSONArray(0).getString(1)
                                             + "\n￥" + profits.getJSONArray(0).get(0) + " "
                                     , new String[]{
+                                            String.valueOf(profits.getJSONArray(0).getIntValue(2)),
                                             profits.getJSONArray(0).getString(1),
                                             String.valueOf(profits.getJSONArray(0).get(0))
                                     }, ct.getResources().getColor(R.color.gray));
@@ -626,12 +657,21 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
 
                     if (receivables != null&&!receivables.isEmpty()) {
                         if (receivables.size() == 2) {
-                            tv_rank_income_left.setText("NO.1\n"+"￥"+receivables.getJSONArray(1).get(0));
-                            tv_rank_income_right.setText("NO.1:" + receivables.getJSONArray(1).getString(1)
-                                    + "\n￥" + receivables.getJSONArray(1).get(0));
-                            receivables.getJSONArray(1).get(0);//第一名  元
-                            receivables.getJSONArray(1).getString(1);//第一名
-                            receivables.getJSONArray(1).get(2);//第一名  元
+                            CommonUtil.textAarrySpanForStyle(tv_rank_income_left,
+                                    "NO."+ receivables.getJSONArray(1).getIntValue(2)
+                                            +":" + receivables.getJSONArray(1).getString(1)
+                                            + "\n￥:" + receivables.getJSONArray(1).get(0) + " "
+                                    , new String[]{
+                                            String.valueOf( receivables.getJSONArray(1).getString(2)),
+                                            receivables.getJSONArray(1).getString(1),
+                                            String.valueOf(receivables.getJSONArray(1).get(0))},
+                                    ct.getResources().getColor(R.color.gray));
+                            CommonUtil.textAarrySpanForStyle(tv_rank_income_right,
+                                    "NO.1:" + receivables.getJSONArray(0).getString(1)
+                                            + "\n￥:" + receivables.getJSONArray(0).get(0) + " "
+                                    , new String[]{receivables.getJSONArray(0).getString(1),
+                                            String.valueOf(receivables.getJSONArray(0).get(0))},
+                                    ct.getResources().getColor(R.color.gray));
                         } else {
                             CommonUtil.textSpanForStyle(tv_rank_income_left,
                                     "NO.__"+"\n￥"+"__"
@@ -670,26 +710,6 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         tv_chuhuo.setText("出货" + root.getIntValue("saleamount") + "元"); 
                         tv_huikuan.setText("回款" + root.getIntValue("backamount") + "元");
                     }
-                    
-//                    CommonUtil.textAarrySpanForStyle(tv_sale_chuhuo
-//                    ,root.getIntValue("saleamount") + " 元出货单金额",
-//                            new String[]{String.valueOf(root.getIntValue("saleamount"))},
-//                            ct.getResources().getColor(R.color.yellow_home));
-//                    CommonUtil.textAarrySpanForStyle(tv_sale_customer,root.getIntValue("customercount") + " 个新增客户"
-//                    ,new String[]{String.valueOf(root.getIntValue("customercount"))},ct.getResources().getColor(R.color.yellow_home));
-//                    CommonUtil.textAarrySpanForStyle( tv_sale_linkman,root.getIntValue("contactcount") + " 个新增联系人"
-//                            ,new String[]{String.valueOf(root.getIntValue("contactcount"))},ct.getResources().getColor(R.color.yellow_home));
-//                    CommonUtil.textAarrySpanForStyle( tv_sale_order,root.getIntValue("salecount") + " 个新增销售单"
-//                            ,new String[]{String.valueOf(root.getIntValue("salecount") )},ct.getResources().getColor(R.color.yellow_home));
-//                    CommonUtil.textAarrySpanForStyle(tv_sale_businessChange,root.getIntValue("nichechangecount") + " 个新增商机变更"
-//                            ,new String[]{String.valueOf(root.getIntValue("nichechangecount"))},ct.getResources().getColor(R.color.yellow_home));
-//                    CommonUtil.textAarrySpanForStyle(tv_sale_business,root.getIntValue("nichecount") + " 个新增商机数"
-//                            ,new String[]{String.valueOf(root.getIntValue("nichecount"))},ct.getResources().getColor(R.color.yellow_home));
-//                    CommonUtil.textAarrySpanForStyle(tv_sale_huikuan, root.getIntValue("backamount") + " 元回款"
-//                            , new String[]{String.valueOf(root.getIntValue("backamount"))}, ct.getResources().getColor(R.color.yellow_home));
-//                    CommonUtil.textAarrySpanForStyle(tv_sale_visit, root.getJSONArray("visit").getIntValue(0) + " 个/" + root.getJSONArray("visit").getIntValue(1) + " 次"
-//                            , new String[]{String.valueOf(root.getJSONArray("visit").getIntValue(0)),
-//                            String.valueOf(root.getJSONArray("visit").getIntValue(1))}, ct.getResources().getColor(R.color.yellow_home));
                     break;
                 case INIT_Targets://指标
                     progressDialog.dismiss();

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

@@ -55,6 +55,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     private String code = null;
     private int type;
     private boolean isBusiness;
+    private String form;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -68,6 +69,7 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         ViewUtils.inject(this);
         type = getIntent().getIntExtra("type", 0);
         code = getIntent().getStringExtra("data");
+        form=getIntent().getStringExtra("from");
         isBusiness = getIntent().getBooleanExtra("business", false);
         if (type == 0) {
             getSupportActionBar().setTitle("新增任务");
@@ -112,7 +114,9 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
-                if (tv_name.testValidity() && tv_executive.testValidity() && tv_date.testValidity()
+                if (tv_name.testValidity() && 
+                        tv_executive.testValidity()
+                        && tv_date.testValidity()
                         && tv_priority.testValidity()
                         && tv_date_start.testValidity()) {
                     sendHttpResquest(Constants.HTTP_SUCCESS_INIT);
@@ -204,34 +208,69 @@ public class TaskAddActivity extends BaseActivity implements View.OnClickListene
         if (isBusiness) {
             strs = "\"handstatus\":\"" + "未完成" + "\",\n" +//编号
                     "\"handstatuscode\":\"" + "UNFINISHED" + "\",\n";
+        }//BusinessDetailInfo
+        String formStore;
+        if (form.equals("BusinessDetailInfo")){
+             formStore = "{\n" +
+                    "\"taskcode\":\"" + tv_code + "\",\n" +//编号
+                    "\"name\":\"" + tv_name.getText().toString() + "\",\n" +//名称
+                    "\"resourcename\":\"" +//执行人
+                    tv_executive.getText().toString() +
+                    "\",\n" +
+                    "\"enddate\":\"" +//结束时间
+                    tv_date.getText().toString() +
+                    "\",\n" +
+                     "\"class\":\"" +//商机详情进来
+                      "bstask" +
+                     "\",\n" +
+                    "\"startdate\":\"" +//结束时间
+                    tv_date_start.getText().toString() +
+                    "\",\n" +
+                    "\"tasklevel\":\"" +
+                    tv_priority.getText().toString() +//任务优先级
+                    "\",\n" +
+                    "\"taskorschedule\":\"" + str//任务类型
+                    + "\",\n" +
+                    "\"custname\":\"" +
+                    tv_customer.getText().toString() +//联系人
+                    "\",\n" +
+                    "\"timealert\":\"" +
+                    tv_notice.getText().toString() +//提醒
+                    "\",\n" +
+                    "\"description\":\"" +
+                    tv_content.getText().toString() +
+                    "\",\n" + (isBusiness ? strs : "") +
+                    "}";
+        }else{
+           formStore = "{\n" +
+                    "\"taskcode\":\"" + tv_code + "\",\n" +//编号
+                    "\"name\":\"" + tv_name.getText().toString() + "\",\n" +//名称
+                    "\"resourcename\":\"" +//执行人
+                    tv_executive.getText().toString() +
+                    "\",\n" +
+                    "\"enddate\":\"" +//结束时间
+                    tv_date.getText().toString() +
+                    "\",\n" +
+                    "\"startdate\":\"" +//结束时间
+                    tv_date_start.getText().toString() +
+                    "\",\n" +
+                    "\"tasklevel\":\"" +
+                    tv_priority.getText().toString() +//任务优先级
+                    "\",\n" +
+                    "\"taskorschedule\":\"" + str//任务类型
+                    + "\",\n" +
+                    "\"custname\":\"" +
+                    tv_customer.getText().toString() +//联系人
+                    "\",\n" +
+                    "\"timealert\":\"" +
+                    tv_notice.getText().toString() +//提醒
+                    "\",\n" +
+                    "\"description\":\"" +
+                    tv_content.getText().toString() +
+                    "\",\n" + (isBusiness ? strs : "") +
+                    "}";
         }
-        String formStore = "{\n" +
-                "\"taskcode\":\"" + tv_code + "\",\n" +//编号
-                "\"name\":\"" + tv_name.getText().toString() + "\",\n" +//名称
-                "\"resourcename\":\"" +//执行人
-                tv_executive.getText().toString() +
-                "\",\n" +
-                "\"enddate\":\"" +//结束时间
-                tv_date.getText().toString() +
-                "\",\n" +
-                "\"startdate\":\"" +//结束时间
-                tv_date_start.getText().toString() +
-                "\",\n" +
-                "\"tasklevel\":\"" +
-                tv_priority.getText().toString() +//任务优先级
-                "\",\n" +
-                "\"taskorschedule\":\"" + str//任务类型
-                + "\",\n" +
-                "\"custname\":\"" +
-                tv_customer.getText().toString() +//联系人
-                "\",\n" +
-                "\"timealert\":\"" +
-                tv_notice.getText().toString() +//提醒
-                "\",\n" +
-                "\"description\":\"" +
-                tv_content.getText().toString() +
-                "\",\n" + (isBusiness ? strs : "") +
-                "}";
+   
         String url = Constants.getAppBaseUrl(ct) + "plm/task/addbilltask.action";
         Map<String, Object> params = new HashMap<>();
         params.put("formStore", formStore);