审批流逻辑重写完成

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/DailyDetailsApprovalFlowAdapter.java

@@ -116,28 +116,25 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
             }
         }
-
-            //TODO 从im获取头像
-       /* try {
-            if (manager == null) manager = new DBManager(mContext);
-            String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
-            String emCode = mCommonApprovalFlowBean.getNodes().get(position).getJn_dealManId();
-            String[] selectionArgs = {emCode, whichsys};
-            String selection = "em_code=? and whichsys=?";
-            //获取数据库数据
-            EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
-            if (bean!=null){
-                String imId = String.valueOf(bean.getEm_IMID());
-                Log.i("todo", "imId=" + imId);
-                AvatarHelper.getInstance().displayAvatar(imId, viewHolder.AppFlowPhoto, true);
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }*/
-
-      //      }
-
+//
+//            //TODO 从im获取头像
+//        try {
+//            if (manager == null) manager = new DBManager(mContext);
+//            String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
+//            String emCode = mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMAN();
+//            String[] selectionArgs = {emCode, whichsys};
+//            String selection = "em_code=? and whichsys=?";
+//            //获取数据库数据
+//            EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+//            if (bean!=null){
+//                String imId = String.valueOf(bean.getEm_IMID());
+//                Log.i("todo", "imId=" + imId);
+//                AvatarHelper.getInstance().displayAvatar(imId, viewHolder.AppFlowPhoto, true);
+//            }
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
 
         return convertView;
     }

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -16,7 +17,10 @@ import com.xzjmyk.pm.activity.adapter.DailyDetailsApprovalFlowAdapter;
 import com.xzjmyk.pm.activity.adapter.DailyDetailsWorkTaskAdapter;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.xzjmyk.pm.activity.bean.oa.WorkTaskBean;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
@@ -185,9 +189,10 @@ public class DailydetailsActivity extends BaseActivity {
                            mCommonApprovalFlowBean = JSON.parseObject(resultJsonObject.toString(), CommonApprovalFlowBean.class);
                            LogUtil.prinlnLongMsg("mCommonApprovalFlowBean",mCommonApprovalFlowBean.toString());
 
+
                            if(mCommonApprovalFlowBean.getData().size()<=0){
                                mEmptyLayput_approvalflow.showEmpty();
-                               ToastMessage("单据审批流数据异常");
+                               ToastMessage("日报审批流数据异常");
                            }
 
                           //TODO 设置数据之前先通过数据库获取到所有的imid保存到内存中