根据测试返回，处理关于下一条时候重复显示问题

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessMsgActivity.java

@@ -648,9 +648,9 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         } else if (jn_dealresult.startsWith("变更处理人")) {
                             statusTextId = R.color.done_approval;
                             if (!StringUtils.isEmpty(jsonArray.getJSONObject(position).getString("JN_OPERATEDDESCRIPTION"))) {
-                                model.status.setText("已变更处理人（" + jsonArray.getJSONObject(position).getString("JN_OPERATEDDESCRIPTION") + ")");
+                                jn_dealresult = "变更处理人（" + jsonArray.getJSONObject(position).getString("JN_OPERATEDDESCRIPTION") + ")";
                             } else {
-                                model.status.setText("已变更处理人");
+                                jn_dealresult = "变更处理人";
                             }
                         } else {
                             jn_dealresult = "已审批";

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

@@ -115,9 +115,9 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
     @Override
     protected void onResume() {
         super.onResume();
-        String permission=android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
-        if (PermissionUtil.lacksPermissions(this,permission)){
-            PermissionUtil.requestPermission(this,0x12,permission);
+        String permission = android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
+        if (PermissionUtil.lacksPermissions(this, permission)) {
+            PermissionUtil.requestPermission(this, 0x12, permission);
         }
     }
 
@@ -336,21 +336,22 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
     public void endProcess() {
         new MaterialDialog.Builder(ct).title(MyApplication.getInstance().getString(R.string.app_dialog_title))
                 .content(R.string.end_approval)
-                .positiveText(MyApplication.getInstance().getString(R.string.app_dialog_close)).autoDismiss(false)
+                .positiveText(MyApplication.getInstance().getString(R.string.common_sure)).autoDismiss(false)
                 .callback(new MaterialDialog.ButtonCallback() {
                     @Override
                     public void onPositive(MaterialDialog dialog) {
-                        finish();
+//                        finish();
                         dialog.dismiss();
-                    }
-                })
-                .positiveText(R.string.load_tonext_approval)
-                .callback(new MaterialDialog.ButtonCallback() {
-                    @Override
-                    public void onPositive(MaterialDialog dialog) {
                         mPresenter.loadNextProcess();
                     }
                 })
+//                .positiveText(R.string.load_tonext_approval)
+//                .callback(new MaterialDialog.ButtonCallback() {
+//                    @Override
+//                    public void onPositive(MaterialDialog dialog) {
+//                        mPresenter.loadNextProcess();
+//                    }
+//                })
                 .show();
     }
 

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

@@ -76,7 +76,6 @@ public class ApprovaPresenter implements OnHttpResultListener {
 
     private List<Approval> historyNodes;//历史审批
 
-    //TODO
     private Approval titleApproval;
     private List<Approval> mainDetailList;//主从表
     private List<Approval> setuptasList;//历史审批要点
@@ -749,7 +748,6 @@ public class ApprovaPresenter implements OnHttpResultListener {
                 if (!ListUtils.isEmpty(formconfigs)) {
                     final List<Approval> mainApproval = formandGriddata(OACheckUtil.getJSONObject(changeData, "change-new"), formdata, formconfigs, record.caller, true, true);
                     mainDetailList.addAll(mainApproval);
-                    // TODO   setData2ListThread(Approval.MAIN, mainApproval);
                 }
             }
             //计算从表
@@ -804,7 +802,6 @@ public class ApprovaPresenter implements OnHttpResultListener {
             }
             mainDetailList.addAll(detailedList);
             ApprovaPresenter.this.mainDetailList = mainDetailList;
-            //TODO
             setData2ListThread();
             OAHttpHelper.getInstance().post(new Runnable() {
                 @Override
@@ -821,7 +818,6 @@ public class ApprovaPresenter implements OnHttpResultListener {
         }
     }
 
-    //TODO 1.隐藏字段明细表重复 2.不该显示字段被显示
     private List<Approval> formandGriddata(final JSONObject changeData,
                                            final JSONObject data,
                                            final JSONArray configs,
@@ -957,7 +953,6 @@ public class ApprovaPresenter implements OnHttpResultListener {
             }
             if (!ListUtils.isEmpty(setuptasks)) {
                 ApprovaPresenter.this.setuptasList = setuptasks;
-                //TODO   setData2ListThread(DETAIL, setuptasks);
                 setData2ListThread();
             }
         }
@@ -1050,7 +1045,8 @@ public class ApprovaPresenter implements OnHttpResultListener {
                  * 已结束
                  * 待审批
                  */
-                for (Approval a : approvals) {
+                for (int i = 0; i < approvals.size(); i++) {
+                    Approval a = approvals.get(i);
                     if (!a.getIdKey().startsWith("已审批")
                             && !a.getIdKey().startsWith("未通过")
                             && !a.getIdKey().startsWith("不同意")
@@ -1058,6 +1054,8 @@ public class ApprovaPresenter implements OnHttpResultListener {
                         hanNotApproval = true;
                         if (a.getIdKey().startsWith("待审批"))
                             a.setValues("");
+                    } else if (a.getIdKey().startsWith("未通过") && i == 0) {
+                        record.status = "未通过";
                     }
                     String emcode = null;
                     if (a.getDfType().contains(",")) {
@@ -1086,7 +1084,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
 //                    }
                 }
 
-                if ("未通过".equals(record.status) || "已结束".equals(record.status)) {
+                if ("未通过".equals(record.status)) {
                     reId = R.drawable.unapproved;
                 } else if (!hanNotApproval && !isApprovaling()) {//没有未审批的数据
                     reId = R.drawable.approved;
@@ -1097,7 +1095,6 @@ public class ApprovaPresenter implements OnHttpResultListener {
                     approvals.add(0, nodeTag);
                 }
                 ApprovaPresenter.this.nodeList = approvals;
-                //TODO  setData2ListThread(Approval.NODES, approvals);
                 setData2ListThread();
                 loading = false;
             }
@@ -1149,7 +1146,6 @@ public class ApprovaPresenter implements OnHttpResultListener {
                     tag.setCaption("附件");
                     enclosureList.add(0, tag);
                     ApprovaPresenter.this.enclosureList = enclosureList;
-                    //TODO setData2ListThread(Approval.ENCLOSURE, enclosureList);
                     setData2ListThread();
                 }
             }
@@ -1197,7 +1193,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
             setNodeStatus(status);
             for (int j = approvals.size() - 1; j >= 0; j--) {
                 Approval a = approvals.get(j);
-                if (hanEnd) continue;
+                if (hanEnd && !equalsOne(status, "待审批")) continue;
                 if (a.getValuesKey().equals(record.nodeName)) {
                     hanEnd = true;
                 }
@@ -1305,7 +1301,6 @@ public class ApprovaPresenter implements OnHttpResultListener {
                         points.setCaption(OACheckUtil.getString(R.string.approval_points));
                         pointsList.add(0, points);
                         ApprovaPresenter.this.pointsList = pointsList;
-                        //TODO  setData2ListThread(Approval.POINTS, pointsList);
                         setData2ListThread();
                     }
                 }

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

@@ -135,8 +135,8 @@ public class AutoErpService extends Service {
                     log(intent.getAction());
                     String falg = intent.getStringExtra("falg");
                     LogUtil.i("falg=" + falg);
+                    CommonInterface.getInstance().judgeManager(null);
                     if (StringUtils.isEmpty(falg) || falg.equals("home")) {
-                        CommonInterface.getInstance().judgeManager(null);
                         init();
                     }
                 } else if (intent.getAction().equals(CHANGE_WORK_TASK)) {//自动打卡任务变更