修改多出闪退和首页bug

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

@@ -357,7 +357,10 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
             }
         } else if (0x22 == requestCode) {//外勤设置
             boolean isAuto = data.getBooleanExtra("isAuto", true);
-            if (!isAuto) {
+            if (ApiUtils.getApiModel() instanceof ApiPlatform) {
+                setResult(0x20);
+                finish();
+            } else if (!isAuto) {
                 if (flag == 1) {
                     //启动手动外勤
                     Intent intent = new Intent(ct, OutofficeActivity.class);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/oa/OAAdapter.java

@@ -11,6 +11,7 @@ import android.widget.TextView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.OAModel;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.OAHttpUtil;
 
 import java.util.List;
@@ -22,9 +23,9 @@ import java.util.List;
 public class OAAdapter extends BaseAdapter {
     private Context ct;
     private List<OAModel> models;
-    private OAHttpUtil util=null;
+    private OAHttpUtil util = null;
 
-    public OAAdapter(Context ct,OAHttpUtil util, List<OAModel> models) {
+    public OAAdapter(Context ct, OAHttpUtil util, List<OAModel> models) {
         this.ct = ct;
         this.util = util;
         this.models = models;
@@ -78,9 +79,10 @@ public class OAAdapter extends BaseAdapter {
 
     private void bindView(int position, ViewHolder holder) throws Exception {
         OAModel model = models.get(position);
-        holder.handler_tv.setVisibility(!model.isTask() ? View.VISIBLE : View.GONE);
+
         holder.title_tv.setText(model.getTitle2Remark());
         holder.address_tv.setText(model.getAddress2Time());
+        holder.handler_tv.setVisibility(showHandlerAble(model) ? View.VISIBLE : View.GONE);
 
         //当前有三个类型，任务日程（status_tv） 拜访报告（status_img） 外勤计划（status_img）
         String status = model.getStatus();
@@ -109,5 +111,23 @@ public class OAAdapter extends BaseAdapter {
         TextView title_tv, status_tv, address_tv, handler_tv;
     }
 
+    /**
+     * 1.我的：1.外勤或是拜访 有开始时间和结束时间
+     * 2.下属：1.有执行人  2.外勤或是拜访 有开始时间和结束时间
+     *
+     * @param model
+     * @return
+     */
+    private boolean showHandlerAble(OAModel model) {
+        if (model.isMe()) {
+            if (!model.isTask() && (model.getStartdate() > 0 || model.getEnddate() > 0))
+                return true;
+            return false;
+        } else {
+            if (!StringUtils.isEmpty(model.getHandler()) || (!model.isTask() && (model.getStartdate() > 0 || model.getEnddate() > 0)))
+                return true;
+            else return false;
+        }
+    }
 
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/AutoErpSigninUitl.java

@@ -404,8 +404,6 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
     public void loadMissionPlan() {
         Map<String, Object> param = new HashMap<>();
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
-
-
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getOutPlan :
                 "mobile/mobileoutplan.action";
         Request request = new Request.Bulider()

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/OAHttpUtil.java

@@ -92,19 +92,18 @@ public class OAHttpUtil {
         else {
             return StringUtils.isInclude(e.getFilterTime(), TimeUtils.s_format.format(curDate));
         }
-
     }
 
     public boolean isTaskOk(OAModel e) {
         if ("已拜访".equals(e.getStatus()) || "已完成".equals(e.getStatus()))
             return true;
-        else if (e.isMission() && e.isTadayBefore() && e.getStartdate() > 0 && e.getEnddate() > 0)
+        else if (isMissionOk(e))
             return true;
         return false;
     }
 
     public boolean isMissionOk(OAModel e) {
-        if (!e.isTadayBefore() && e.getStartdate() > 0 && e.getEnddate() > 0 && e.getStartdate() != e.getEnddate()) {
+        if (e.isTadayBefore() && e.getStartdate() > 0 && e.getEnddate() > 0 && e.getStartdate() != e.getEnddate()) {
             return true;
         } else {
             String status = e.getStatus();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/http/Request.java

@@ -7,7 +7,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
- * Created by Bitliker on 2017/4/7.
+ * Created by Bitliker on 2017/3/7.
  */
 
 public class Request implements Serializable {

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

@@ -584,17 +584,17 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                     et_task_people.setTags("");
                     return;
                 }
-                int i=0;
+                int i = 0;
                 StringBuilder select = new StringBuilder();
-                tagValues=new String[employeesList.size()];
+                tagValues = new String[employeesList.size()];
                 for (SelectEmUser e : employeesList) {
                     select.append(e.getEmName() + ",");
-                    tagValues[i++]=e.getEmCode();
+                    tagValues[i++] = e.getEmCode();
                 }
                 OACheckUtil.removieLast(select);
                 selectNames = select.toString();
-                String[] tag =  selectNames.split(",");
-                
+                String[] tag = selectNames.split(",");
+
                 et_task_people.setTags(tag);
                 break;
             default: