修改审批界面配合字段更新

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

@@ -91,16 +91,20 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        if (holder instanceof TitleViewHolder) {
-            bindTitleView((TitleViewHolder) holder, position);
-        } else if (holder instanceof BaseRVViewHodler) {
-            bindBaseRVView((BaseRVViewHodler) holder, position);
-        } else if (holder instanceof TagViewHolder) {
-            bindTAGView((TagViewHolder) holder, position);
-        } else if (holder instanceof PointsViewHolder) {
-            bindPointsView((PointsViewHolder) holder, position);
-        } else if (holder instanceof NodeViewHolder) {
-            bindNodeView((NodeViewHolder) holder, position);
+        try {
+            if (holder instanceof TitleViewHolder) {
+                bindTitleView((TitleViewHolder) holder, position);
+            } else if (holder instanceof BaseRVViewHodler) {
+                bindBaseRVView((BaseRVViewHodler) holder, position);
+            } else if (holder instanceof TagViewHolder) {
+                bindTAGView((TagViewHolder) holder, position);
+            } else if (holder instanceof PointsViewHolder) {
+                bindPointsView((PointsViewHolder) holder, position);
+            } else if (holder instanceof NodeViewHolder) {
+                bindNodeView((NodeViewHolder) holder, position);
+            }
+        } catch (Exception e) {
+
         }
     }
 
@@ -379,7 +383,8 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         AvatarHelper.getInstance().display(approval.getIdKey(), holder.handIv, true, false);
         if (approval.getId() > 0) {
             holder.statusIv.setVisibility(View.VISIBLE);
-            holder.statusIv.setImageResource(approval.getId());
+            if (approval.getId() > 0)
+                holder.statusIv.setImageResource(approval.getId());
         } else {
             holder.statusIv.setVisibility(View.GONE);
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBManager.java

@@ -49,6 +49,7 @@ public class DBManager {
 
     ;
 
+    @Deprecated
     public DBManager() {
         db = DatabaseManager.getInstance().openDatabase();
     }

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

@@ -65,7 +65,6 @@ public class ApprovaPresenter implements OnHttpResultListener {
 
     private IApproval iApproval;
     private ApprovalRecord record;
-    private DBManager manager;
     public String chchePoints = "";//审批要点缓存
     private String title;
     private String master;
@@ -140,10 +139,10 @@ public class ApprovaPresenter implements OnHttpResultListener {
     }
 
     public void closeDB() {
-        if (manager != null) {
-            manager.closeDB();
-            manager = null;
-        }
+//        if (manager != null) {
+//            manager.closeDB();
+//            manager = null;
+//        }
     }
 
     public String getUrl(String baseUrl, String title) {
@@ -982,7 +981,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
                     }
                 }
                 int reId = -1;
-                if ("未通过".equals(record.status)||"已结束".equals(record.status)) {
+                if ("未通过".equals(record.status) || "已结束".equals(record.status)) {
                     reId = R.drawable.unapproved;
                 } else if (!hanNotApproval) {
                     reId = R.drawable.approved;
@@ -1225,7 +1224,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
     }
 
     private int getImByCode(String emCode) {
-        if (manager == null) manager = new DBManager();
+        DBManager manager = DBManager.getInstance();
         String whichsys = CommonUtil.getMaster();
         if (StringUtils.isEmpty(emCode) || StringUtils.isEmpty(whichsys)) return 0;
         String[] selectionArgs = {emCode, whichsys};