2016/09/09 修改

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

@@ -86,9 +86,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     @ViewInject(R.id.my_log_tag)
     private View my_log_tag;//我的工作日志标识
     private int tag = 1;
-    private ArrayList<OABean> meBeans = null;//我的全部的
-    private ArrayList<OABean> otherBeans = null;//我的下属全部的数据
-    private List<OABean> showBeans = new ArrayList<>();//当前显示的数据
+    private ArrayList<OABean> meBeans = null;
+    private ArrayList<OABean> otherBeans = null;
     private MyListViewAdapter adapter;
     private EmptyLayout mEmptyLayout;
 
@@ -103,6 +102,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                     if (jsonObject.isEmpty())
                         return;
                     loadSuccess(jsonObject);
+                    setTop();
                     break;
             }
         }
@@ -151,6 +151,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         }
         setTaskDay(tag == 1 ? meBeans : otherBeans);
     }
+
     private void setTaskDay(List<OABean> beans) {
         Calendar c = Calendar.getInstance();
         ArrayList<Integer> tasks = new ArrayList<>();
@@ -239,19 +240,19 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 return;
             }
             List<OABean> chche = new ArrayList<>();
-            String name = "," + entity.getName().trim() + ",";
+            String name = entity.getName().trim();
             if (name == null) return;
             String nameStr;
             for (OABean e : otherBeans) {
-                if (StringUtils.isEmpty(e.getHandler())) {//任务日程
+                if (e.getHandler() != null) {//任务日程
+                    if (e.getHandler() == null || e.getHandler().length() <= 0) continue;
                     nameStr = "," + e.getHandler().trim() + ",";
                     if (getResult(nameStr, name)) {//是该下属任务日程
                         chche.add(e);
                     }
-                } else if (StringUtils.isEmpty(e.getRecordman())) {//拜访
+                } else if (e.getRecordman() != null) {//拜访
+                    if (e.getRecordman() == null || e.getRecordman().length() <= 0) continue;
                     nameStr = "," + e.getRecordman().trim() + ",";
-                    Log.i("gongpengming", "nameStr=" + nameStr);
-                    Log.i("gongpengming", "name=" + name);
                     if (getResult(nameStr, name)) {//是该下属任务日程
                         chche.add(e);
                     }
@@ -333,6 +334,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         if (getIntent() == null || getIntent().getIntExtra("type", 0) != 1) return;
         oa_rl_choose.setVisibility(View.GONE);
         getSupportActionBar().setTitle("客户拜访");
+
     }
 
     //获取数据
@@ -342,7 +344,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         final Map<String, Object> param = new HashMap<>();
         param.put("emcode", CommonUtil.getSharedPreferences(this, "erp_username"));
         param.put("date", TimeUtils.ym_long_2_str(System.currentTimeMillis()));
-        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(this, url, param, handler, headers, WHAT_LOAD, null, null, "get");
@@ -457,8 +458,15 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 int ok = 0;
                 int noOk = 0;
                 List<OABean> beans = new ArrayList<>();
-                try {
-                    for (OABean e : showBeans == null ? new ArrayList<OABean>() : showBeans) {
+                try {// meBeans : otherBeans 可能为空
+//                    for (OABean e : (tag == 1 ? meBeans : otherBeans)) {
+                    List<OABean> b;
+                    if (tag == 1) {
+                        b = meBeans == null ? new ArrayList<OABean>() : meBeans;
+                    } else {
+                        b = otherBeans == null ? new ArrayList<OABean>() : otherBeans;
+                    }
+                    for (OABean e : b) {
                         if (e.getStartdate() == null) continue;
                         c.setTimeInMillis(TimeUtils.f_str_2_long(e.getStartdate()));
                         int day = c.get(Calendar.DAY_OF_MONTH);
@@ -532,6 +540,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 setTaskDay(otherBeans);
             }
         }
+        setTop();
     }
 
     //列表适配器
@@ -543,7 +552,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
 
         public MyListViewAdapter(List<OABean> beans) {
             if (ListUtils.isEmpty(beans)) mEmptyLayout.showEmpty();
-
             this.beans = getBeans(beans);
         }
 
@@ -560,7 +568,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                     }
             }
             setPoithNum(chche);
-            showBeans = getBeans(beans);
             return chche;
         }
 

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

@@ -288,7 +288,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             public void setTime(String year, String month, String day) {
                 String time = year + "-" + month + "-" + day;
                 isToday = time.equals(TimeUtils.s_long_2_str(System.currentTimeMillis())) ? true : false;
-                title.setText(year + "年" + month + "月" + day + "日" + TimeUtils.getWeek(TimeUtils.s_str_2_long(time)));
+                title.setText(year + "年" + month + "月" + day + "日  " + TimeUtils.getWeek(TimeUtils.s_str_2_long(time)));
                 if (adapter != null && adapter.getBeans() != null && adapter.getBeans().size() > 0)
                     adapter.getBeans().clear();
                 loadNetData(TimeUtils.s_str_2_long(time));
@@ -478,6 +478,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
         //TODO 待优化算法处理
         for (int i = 0; i < beans.size(); i++) {
             b = beans.get(i);
+            beans.get(i).signinList.clear();
             for (String e : logTime) {
                 if (!StringUtils.isEmpty(b.startSignin) && !StringUtils.isEmpty(b.endSignnin) && e.compareTo(b.startSignin) > 0 && e.compareTo(b.endSignnin) < 0) {
                     beans.get(i).signinList.add(e);