Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiPlatform.java

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

@@ -437,7 +437,6 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
                     boolean falg = ViewUtil.isCheckDateTime(tv_start_time.getText()
                                     .toString(),
                             tv_end_time.getText().toString(), "yyyy-MM-dd HH:mm");
-
                     if (falg) {
                         ToastMessage("结束时间小于开始时间！");
                     } else {
@@ -445,15 +444,11 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
                         httpSave();
                     }
                 }
-
                 break;
-
             case R.id.bt_commit:
                 progressDialog.show();
                 httpCommit();
-
                 break;
-
             case R.id.bt_add:
                 // 清空编辑框数据
                 // 隐藏button
@@ -495,7 +490,6 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
                         httpUpdate();
                     }
                 }
-
                 break;
 
             case R.id.et_leave_category:
@@ -503,24 +497,17 @@ public class LeaveActivity extends BaseActivity implements OnClickListener, Reco
 //                loadDataForServer("va_vacationtype", SUCCESS_VACATION);
                 selectLeaveType();
                 break;
-
             case R.id.et_leave_type:
                 progressDialog.show();
                 loadDataForServer("va_holidaytype", SUCCESS_LEAVETYPE);
-
-
                 break;
-
             case R.id.tv_start_time:
 //                showDialog(v);
                 showDateDialog(this, tv_start_time);
-
                 break;
-
             case R.id.tv_end_time:
 //                showDialog(v);
                 showDateDialog(this, tv_end_time);
-
                 break;
 
             case R.id.et_leave_man:

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

@@ -246,9 +246,7 @@ public class TaskB2BActivity extends BaseActivity {
         if (state_unconfirmed.isSelected()) {
             sendResquestForServer("UNCONFIRMED", 2);
         }
-        if (state_taskforme.isSelected()) {
-            sendResquestForServerOther(2);
-        }
+       
     }
     
 
@@ -289,6 +287,7 @@ public class TaskB2BActivity extends BaseActivity {
             state_add = (Button) view.findViewById(R.id.btn_state_ADD);
             state_all = (Button) view.findViewById(R.id.btn_state_ALL);
             state_taskforme = (Button) view.findViewById(R.id.btn_state_TASKFOME);
+            state_taskforme.setVisibility(View.GONE);
             // 创建一个PopuWidow对象
             popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth(), windowManager.getDefaultDisplay().getHeight() / 3);
             state_start.setSelected(true);
@@ -361,7 +360,6 @@ public class TaskB2BActivity extends BaseActivity {
             @Override
             public void onClick(View v) {
                 popupWindow.dismiss();
-                sendResquestForServerOther(2);
                 state_start.setSelected(false);
                 state_finish.setSelected(false);
                 state_unconfirmed.setSelected(false);
@@ -380,7 +378,6 @@ public class TaskB2BActivity extends BaseActivity {
                 state_unconfirmed.setSelected(false);
                 state_all.setSelected(true);
                 sendResquestForServer("", 2);
-//                sendResquestForServerAll(2);
             }
         });
     }
@@ -396,51 +393,14 @@ public class TaskB2BActivity extends BaseActivity {
         params.put("emuu", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"b2b_uu"));
         params.put("enuu", ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getEnuu());
         params.put("pageNumber", "1");
-        params.put("pageSize", "10");
+        params.put("pageSize", "100");
         params.put("status", status);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie",  ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         ViewUtil.httpSendRequest(context, url, params, handler, headers, handlerWhat, null, null, "get");
     }
 
-    /**
-     * @注释： 带条件的调转
-     */
-    public void sendResquestForServerAll(int handlerWhat) {
-        String url = Constants.getAppBaseUrl(context) + "common/datalist/data.action";
-        Map<String, Object> mparams = new HashMap<String, Object>();
-        mparams.put("sessionId", CommonUtil.getSharedPreferences(context, "sessionId"));
-        mparams.put("caller", "ResourceAssignment");
-        mparams.put("page", "1");
-        mparams.put("pageSize", "100");
-        mparams.put("_noc", "1");
-        String em_code = CommonUtil.getSharedPreferences(context, "erp_username");
-        mparams.put("condition", "ra_resourcecode='" + em_code + "'" + " and nvl(class,' ')<>'projecttask'");
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(context, "sessionId"));
-        ViewUtil.httpSendRequest(context, url, mparams, handler, headers, handlerWhat, null, null, "get");
-    }
-
-    /**
-     * @注释： 下属任务
-     */
-    public void sendResquestForServerOther(int handlerWhat) {
-        String url = Constants.getAppBaseUrl(context) + "common/datalist/data.action";
-        Map<String, Object> mparams = new HashMap<String, Object>();
-        mparams.put("sessionId", CommonUtil.getSharedPreferences(context, "sessionId"));
-        mparams.put("caller", "ResourceAssignment");
-        mparams.put("page", "1");
-        mparams.put("pageSize", "100");
-        mparams.put("_noc", "1");
-        String em_code = CommonUtil.getSharedPreferences(context, "erp_emid");
-        mparams.put("condition", "recorderid='" + em_code + "'" + "and handstatuscode<>'FINISHED'" + " and nvl(class,' ')<>'projecttask'");
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(context, "sessionId"));
-        ViewUtil.httpSendRequest(
-                context, url,
-                mparams,
-                handler, headers, handlerWhat, null, null, "get");
-    }
+    
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {