修复bug，写企业架构树界面

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

@@ -33,6 +33,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -237,7 +238,7 @@ public class AttendanceFragment extends EasyFragment implements HttpHandler.OnRe
     /**
      * 处理打卡签到列表，建议在线程钟使用
      *
-     * @param models  获取班次信息时候的数据
+     * @param models 获取班次信息时候的数据
      * @throws Exception
      */
     private void handlerWorkLog(JSONObject object, final ArrayList<WorkModel> models) throws Exception {
@@ -312,6 +313,24 @@ public class AttendanceFragment extends EasyFragment implements HttpHandler.OnRe
         return TimeUtils.long2str(time, "HH:mm");
     }
 
+    private void handlerDate(JSONObject object) {
+        l1.setText("应该出勤 " + getNull(object, "ychuqin") + " 天");
+        r1.setText("实际出勤 " + getNull(object, "achuqin") + " 天");
+        l2.setText("正常打卡 " + getNull(object, "nday") + " 天");
+        r2.setText("实际工时 " + getNull(object, "atime") + " 天");
+        l3.setText("迟到 " + getNull(object, "latecount") + " 天");
+        r3.setText("早退 " + getNull(object, "earlycount") + " 天");
+
+        l4.setText("旷工 " + getNull(object, "noncount") + " 天");
+        r4.setText("补卡 " + getNull(object, "qjdaty") + " 天");
+
+        l5.setText("请假 " + getNull(object, "qjdaty") + " 天");
+        r5.setText("加班 " + getNull(object, "qjdaty") + " 天");
+
+        l6.setText("出差 " + getNull(object, "outdays") + " 天");
+        r6.setText("补卡 " + getNull(object, "outcount") + " 天");
+    }
+
     private void setDate2Adapter() {
         if (adapter == null) {
             adapter = new WorkAdapter();
@@ -351,24 +370,6 @@ public class AttendanceFragment extends EasyFragment implements HttpHandler.OnRe
 
     }
 
-    private void handlerDate(JSONObject object) {
-        l1.setText("应该出勤 " + getNull(object, "ychuqin") + " 天");
-        r1.setText("实际出勤 " + getNull(object, "achuqin") + " 天");
-        l2.setText("正常打卡 " + getNull(object, "nday") + " 天");
-        r2.setText("实际工时 " + getNull(object, "atime") + " 天");
-        l3.setText("迟到 " + getNull(object, "latecount") + " 天");
-        r3.setText("早退 " + getNull(object, "earlycount") + " 天");
-
-        l4.setText("旷工 " + getNull(object, "noncount") + " 天");
-        r4.setText("补卡 " + getNull(object, "qjdaty") + " 天");
-
-        l5.setText("请假 " + getNull(object, "qjdaty") + " 天");
-        r5.setText("加班 " + getNull(object, "qjdaty") + " 天");
-
-        l6.setText("出差 " + getNull(object, "outdays") + " 天");
-        r6.setText("补卡 " + getNull(object, "outcount") + " 天");
-    }
-
 
     private int getNull(JSONObject object, String key) {
         if (object == null || !object.containsKey(key)) return 0;
@@ -383,19 +384,26 @@ public class AttendanceFragment extends EasyFragment implements HttpHandler.OnRe
 
 
     class WorkAdapter extends BaseAdapter {
+        private List<WorkModel> models;
+
+
+        public void setModels(List<WorkModel> models) {
+            this.models = models;
+        }
+
         @Override
         public int getCount() {
-            return 0;
+            return ListUtils.isEmpty(models) ? 0 : models.size();
         }
 
         @Override
         public Object getItem(int i) {
-            return null;
+            return models.get(i);
         }
 
         @Override
         public long getItemId(int i) {
-            return 0;
+            return i;
         }
 
         @Override
@@ -414,6 +422,7 @@ public class AttendanceFragment extends EasyFragment implements HttpHandler.OnRe
                 hoder = (ViewHoder) view.getTag();
             }
             initItemView(hoder);
+
             return view;
         }
 

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

@@ -139,8 +139,8 @@ public class AddFlihtsPresenter implements HttpHandler.OnResultListener {
         Bundle bundle = null;
         String action = "mobile/getManAndDefaultor.action";
         Map<String, Object> param = new HashMap<>();
-        param.put("wd_emcode", manCode);
-        param.put("wd_defaultorcode", defaultorCode);
+        param.put("wd_emcode", StringUtils.isEmpty(manCode)?"":manCode);
+        param.put("wd_defaultorcode", StringUtils.isEmpty(defaultorCode)?"":defaultorCode );
         HttpHandler.getInstance().loadERPByNet(MAN_DEFAULTOR, action,
                 param, bundle, this);
     }

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

@@ -589,7 +589,7 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
      * @param models     班次以及打卡记录数据
      * @param macAddress mac地址
      */
-    private void submitWork(ArrayList<WorkModel> models, String macAddress) {
+    private void submitWork(final ArrayList<WorkModel> models, String macAddress) {
         subMitTime = System.currentTimeMillis();
         validatorMac(models, macAddress);
 //        CommonInterface.getInstance().getCodeByNet("CardLog", new CommonInterface.OnResultListener() {