审批流逻辑重写完成

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

@@ -76,22 +76,10 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
         //获取 已审批节点数量 和总审批节点数
         int nodesnum = mCommonApprovalFlowBean.getNodes().size();
         int datanum = mCommonApprovalFlowBean.getData().size();
-        viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
-        //当审批流为空时默认第一个审批人为审批节点
-        if(mCommonApprovalFlowBean.getNodes() == null ||nodesnum <= 0){
-            viewHolder.AppFlowTime.setText(null);
-            viewHolder.AppFlowStatus.setText(null);
-            if (mCommonApprovalFlowBean.getData().size() > 0){
-                viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
-            }
-            //当审批流程开始时
-            if(position == 0){
-                viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
-                viewHolder.AppFlowStatus.setText("待审批");
-                viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
-            }
-        }else{
-            if (position < nodesnum && datanum > 0){
+        int processnum = mCommonApprovalFlowBean.getProcesss().size();
+        if(nodesnum >0 && datanum >0 &&processnum >0){
+            viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
+            if(position < nodesnum){
                 String approval_status = mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult();
                 if (!approval_status.isEmpty() && approval_status.equals("同意")) {
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
@@ -110,25 +98,20 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
                     viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position).getJn_dealTime());
                 }
-
-                else if(position == (nodesnum -1)) {
-
-                }
-
-                //当节点为none状态是gone掉默认审批状态和时间
+                //当节点为none状态是清空掉默认审批状态和时间
                 else {
                     viewHolder.AppFlowStatus.setText(null);
                     viewHolder.AppFlowTime.setText(null);
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
                 }
-            } //当节点是待审批状态时
+            }
+            //当节点是待审批状态时
             else if(position == nodesnum && position <=datanum && mCommonApprovalFlowBean.getData().get(position).getJP_NODENAME().equals(mCommonApprovalFlowBean.getCurrentnode().getNodename())){
                 viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                 viewHolder.AppFlowStatus.setText("待审批");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
             }
 
-
             //TODO 从im获取头像
        /* try {
             if (manager == null) manager = new DBManager(mContext);
@@ -145,12 +128,8 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
             }
 
         } catch (Exception e) {
-
-
-        }*/
-            }
-
-
+         }*/
+        }
         return convertView;
     }
 

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

@@ -80,22 +80,10 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
         //获取 已审批节点数量 和总审批节点数
         int nodesnum = mCommonApprovalFlowBean.getNodes().size();
         int datanum = mCommonApprovalFlowBean.getData().size();
-        viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
-        //当审批流为空时默认第一个审批人为审批节点
-        if(mCommonApprovalFlowBean.getNodes() == null ||nodesnum <= 0){
-           viewHolder.AppFlowTime.setText(null);
-            viewHolder.AppFlowStatus.setText(null);
-            if (mCommonApprovalFlowBean.getData().size() > 0){
-                viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
-            }
-            //当审批流程开始时
-            if(position == 0){
-                viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
-                viewHolder.AppFlowStatus.setText("待审批");
-                viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
-            }
-        }else{
-            if (position < nodesnum && datanum > 0){
+        int processnum = mCommonApprovalFlowBean.getProcesss().size();
+        if(nodesnum >0 && datanum >0 &&processnum >0){
+            viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
+            if(position < nodesnum){
                 String approval_status = mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult();
                 if (!approval_status.isEmpty() && approval_status.equals("同意")) {
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));
@@ -114,23 +102,20 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
                     viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position).getJn_dealTime());
                 }
-
-                else if(position == (nodesnum -1)) {
-
-                }
-
-                //当节点为none状态是gone掉默认审批状态和时间
+                //当节点为none状态是清空掉默认审批状态和时间
                 else {
                     viewHolder.AppFlowStatus.setText(null);
                     viewHolder.AppFlowTime.setText(null);
                     viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
                 }
-            } //当节点是待审批状态时
+            }
+            //当节点是待审批状态时
             else if(position == nodesnum && position <=datanum && mCommonApprovalFlowBean.getData().get(position).getJP_NODENAME().equals(mCommonApprovalFlowBean.getCurrentnode().getNodename())){
                 viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                 viewHolder.AppFlowStatus.setText("待审批");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
             }
+        }
 
             //TODO 从im获取头像
        /* try {
@@ -151,7 +136,7 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
             e.printStackTrace();
         }*/
 
-            }
+      //      }
 
 
         return convertView;

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

@@ -184,13 +184,15 @@ public class DailydetailsActivity extends BaseActivity {
                        }else{
                            mCommonApprovalFlowBean = JSON.parseObject(resultJsonObject.toString(), CommonApprovalFlowBean.class);
                            LogUtil.prinlnLongMsg("mCommonApprovalFlowBean",mCommonApprovalFlowBean.toString());
-                          //TODO 设置数据之前先通过数据库获取到所有的imid保存到内存中
-                           mDailyDetailsApprovalFlowAdapter.setmCommonApprovalFlowBean(mCommonApprovalFlowBean);
-                           approval_flowlv.setAdapter(mDailyDetailsApprovalFlowAdapter);
 
-                           if(mCommonApprovalFlowBean.getNodes().size()<= 0 && mCommonApprovalFlowBean.getData().size()<=0){
+                           if(mCommonApprovalFlowBean.getData().size()<=0){
                                mEmptyLayput_approvalflow.showEmpty();
+                               ToastMessage("单据审批流数据异常");
                            }
+
+                          //TODO 设置数据之前先通过数据库获取到所有的imid保存到内存中
+                           mDailyDetailsApprovalFlowAdapter.setmCommonApprovalFlowBean(mCommonApprovalFlowBean);
+                           approval_flowlv.setAdapter(mDailyDetailsApprovalFlowAdapter);
                        }
                    }catch (JSONException e){
                        e.printStackTrace();