pro兼容失败

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

@@ -170,9 +170,12 @@ public class CommonDocDetailsActivity extends BaseActivity {
         final Intent intent = getIntent();
         mCaller = intent.getStringExtra("caller");
         mkeyValue = intent.getIntExtra("keyValue", -1);
+        real_status = intent.getStringExtra("status");
         Log.i("mCaller", mCaller);
         Log.isLoggable("keyValue", mkeyValue);
+        Log.i("real_status", real_status);
 
+        SetComDocStatus(real_status);
         //当获取到正确的单据caller和单据id时
         if (!TextUtils.isEmpty(mCaller) && mkeyValue != -1) {
             if ("Ask4Leave".equals(mCaller)) {
@@ -293,7 +296,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
                         resanddel_ll.setVisibility(View.GONE);
                     }else if (!TextUtils.isEmpty(real_status) && real_status.equals("已提交")){
                         commondoc_sv.setVisibility(View.VISIBLE);
-                        resanddel_ll.setVisibility(View.VISIBLE);
                     }
 
                     break;
@@ -341,7 +343,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
                 resanddel_ll.setVisibility(View.GONE);
             } else {
                 commondoc_sv.setVisibility(View.VISIBLE);
-                resanddel_ll.setVisibility(View.VISIBLE);
                 mCommonDocMainMsgAdapter.setFormdataBeans(formdataArray);
                 if (griddataArray == null) {
                     secondmsg_ll.setVisibility(View.GONE);
@@ -383,13 +384,13 @@ public class CommonDocDetailsActivity extends BaseActivity {
                             getapplypeomsg(em_number);
 
                             //申请单据的审批，提交，录入状态获取
-                            if ((!TextUtils.isEmpty(fd_field) && fd_field.equals("va_status")) ||
-                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("wo_status")) ||
-                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("sa_status")) ||
-                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("fp_status"))){
-                                real_status = formdataArray.getJSONObject(0).getString(fd_field);
-                                SetComDocStatus(real_status);
-                            }
+//                            if ((!TextUtils.isEmpty(fd_field) && fd_field.equals("va_status")) ||
+//                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("wo_status")) ||
+//                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("sa_status")) ||
+//                                    (!TextUtils.isEmpty(fd_field) && fd_field.equals("fp_status"))){
+//                                real_status = formdataArray.getJSONObject(0).getString(fd_field);
+//                                SetComDocStatus(real_status);
+//                            }
                         }
                         mCommonDocMainMsgAdapter.setmFormconfigsBean(mFormconfigsBean);
                         main_msg_lv.setAdapter(mCommonDocMainMsgAdapter);
@@ -475,12 +476,15 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     for (int i = 0; i < mCommonApprovalFlowBean.getData().size(); i++) {
                         if (manager == null) manager = new DBManager(mContext);
                         String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
-                        if (mCommonApprovalFlowBean.getProcesss() != null && mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan() !=null
-                                && !mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan().equals(mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN())){
-                            emCode = mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan();
-                        }else {
-                            emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
-                        }
+                        emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
+//                        if (mCommonApprovalFlowBean.getProcesss() != null){
+//                            int pronum = mCommonApprovalFlowBean.getProcesss().size();
+//                            if (i<pronum && mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan() !=null){
+//                                emCode = mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan();
+//                            }
+//                        }else {
+//                            emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
+//                        }
                         try {
                             if (emCode.contains(",")) {
 //                                im_ids.add("");
@@ -536,34 +540,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
 //                name_tv.setText(mCommonApprovalFlowBean.getProcesss().get(0).getJp_launcherName());  //申请人姓名 从process获取
                 getapplypeomsg(em_number);
             }
-           /* if (!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())) {
-                int data_num = mCommonApprovalFlowBean.getData().size();
-                int nodes_num = mCommonApprovalFlowBean.getNodes().size();
-                String app_status = mCommonApprovalFlowBean.getNodes().get(nodes_num - 1).getJn_dealResult();
-                if ((nodes_num == data_num && nodes_num > 0) &&
-                        mCommonApprovalFlowBean.getNodes().get(data_num - 1).getJn_dealResult() != null &&
-                        mCommonApprovalFlowBean.getNodes().get(data_num - 1).getJn_dealResult().equals("同意")) {
-                    status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
-                    status_tv.setText("已审批");
-                } else {
-                    status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
-                    status_tv.setText("待审批");
-                }
-            } else {
-                status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
-                status_tv.setText("待审批");
-            }
-
-        } else if (ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
-                && ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())
-                && ListUtils.isEmpty(mCommonApprovalFlowBean.getData())) {
-
-            status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.titleBlue));
-            status_tv.setText("未提交");
-
-        } else {
-            status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
-            status_tv.setText("待审批");*/
         }
 
         // 当单据未提交 未触发审批流时，默认静态显示申请人的信息
@@ -598,8 +574,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
             approval_ll.setVisibility(View.GONE);
         } else {
             approval_ll.setVisibility(View.GONE);
-            resanddel_ll.setVisibility(View.VISIBLE);
-
             resubmit_ll.setOnClickListener(new View.OnClickListener() { // 重新提交
                 @Override
                 public void onClick(View v) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -390,7 +390,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     if (mContext==null)return;
                                     startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
                                             .putExtra("caller", caller)
-                                            .putExtra("keyValue", va_id));
+                                            .putExtra("keyValue", va_id)
+                                            .putExtra("status","已提交"));
                                     click_btn.setEnabled(true);
                                     finish();
                                     overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/FormListSelectActivity.java

@@ -402,7 +402,8 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                     startActivity(new Intent(mContext,
                             CommonDocDetailsActivity.class)
                             .putExtra("caller", caller)
-                            .putExtra("keyValue", keyId));
+                            .putExtra("keyValue", keyId)
+                            .putExtra("status",status));
                 }
   
             }

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

@@ -23,7 +23,6 @@ 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.ui.MainActivity;
 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;
@@ -32,7 +31,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.view.MyListView;
@@ -53,6 +51,7 @@ public class DailydetailsActivity extends BaseActivity {
     private static final int DAILY_REFORSUB_SUCCESSFULLY = 1209;
     private static final int DAILY_REFORDELETE_SUCCESSFULLY = 1214;
     public static final int DELETE_SUCCEED = 1219;
+    private static final int REFORDELETE_DOC_REQUEST_SUCCESSFULLY = 1220;
     private TextView wdd_data;
     private TextView wdd_status;
     private TextView wdd_summary;
@@ -121,11 +120,21 @@ public class DailydetailsActivity extends BaseActivity {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))){
                             String resfordelete_result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("RESUBMITTED_message", resfordelete_result);
-//                            Toast.makeText(ct, "工作日报反提交成功", Toast.LENGTH_SHORT).show();
                             dodelete(mCaller, mkeyValue);
                         }
                     }
                     break;
+                case REFORDELETE_DOC_REQUEST_SUCCESSFULLY:
+                    if(msg.getData() != null){
+                        if (!StringUtils.isEmpty(msg.getData().getString("result"))){
+                            String delete_result = msg.getData().getString("result");
+                            LogUtil.prinlnLongMsg("refordelete_result", delete_result);
+                            if (JSON.parseObject(delete_result).containsKey("success") && JSON.parseObject(delete_result).getBoolean("success")) {
+                                dodelete(mCaller,mkeyValue);
+                            }
+                        }
+                    }
+                    break;
                 case DELETE_DOC_REQUEST_SUCCESSFULLY:
                     if(msg.getData() != null){
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))){
@@ -186,12 +195,15 @@ public class DailydetailsActivity extends BaseActivity {
                     for (int i = 0; i < mCommonApprovalFlowBean.getData().size(); i++) {
                         if (manager == null) manager = new DBManager(mContext);
                         String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
-                        if (mCommonApprovalFlowBean.getProcesss() != null && mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan() !=null
-                                && !mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan().equals(mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN())){
-                            emCode = mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan();
-                        }else {
-                            emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
-                        }
+                        emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
+//                        if (mCommonApprovalFlowBean.getProcesss() != null){
+//                            int pronum = mCommonApprovalFlowBean.getProcesss().size();
+//                                if (i<pronum && mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan() !=null){
+//                                    emCode = mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan();
+//                                }
+//                        }else {
+//                            emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
+//                        }
                         if( emCode.contains(",")){
                             String str[] = emCode.split(",");
                             emCode = str[0];
@@ -393,7 +405,7 @@ public class DailydetailsActivity extends BaseActivity {
         if (retype.equals("reforsub")){  //反提交之重新提交请求
             ViewUtil.httpSendRequest(this, resubmit_url, params, handler, headers, DAILY_REFORSUB_SUCCESSFULLY, null, null, "post");
         }else if (retype.equals("refordelete")){ //反提交之删除请求
-            ViewUtil.httpSendRequest(this, resubmit_url, params, handler, headers, DELETE_DOC_REQUEST_SUCCESSFULLY, null, null, "post");
+            ViewUtil.httpSendRequest(this, resubmit_url, params, handler, headers, REFORDELETE_DOC_REQUEST_SUCCESSFULLY, null, null, "post");
         }
     }
 
@@ -423,7 +435,6 @@ public class DailydetailsActivity extends BaseActivity {
         }else {
             done_task_ll.setVisibility(View.GONE);
         }
-//        if (!TextUtils.isEmpty(summary) && !TextUtils.isEmpty(status) && !TextUtils.isEmpty(date)) {
         wdd_data.setText(date);
         wdd_summary.setText(summary);
         if(wd_status.equals("已审核")){
@@ -444,10 +455,7 @@ public class DailydetailsActivity extends BaseActivity {
 
         wdd_plan.setText(plan);
         wdd_experience.setText(experience);
-//        } else {
-//            Toast.makeText(this, "数据异常", Toast.LENGTH_LONG).show();
-//            finish();    //这里就是处理在后台错误情况下传回错的数据才会执行该finish语句，否则永不执行
-//        }
+
 
         // 当获取到正确的单据caller和单据id时 请求获取审批流数据
         if(!TextUtils.isEmpty(mCaller)&&mkeyValue!= -1){
@@ -504,44 +512,11 @@ public class DailydetailsActivity extends BaseActivity {
     }
 
     /**
-     *  兼容data[]审批人信息为空的情况，UAS部门这里data全部异常,！！
+     *  兼容data[]审批人信息为空的情况，UAS部门这里data全部异常,！！ ,仅仅对日报审批流这样处理了，通用单据没兼容
      *  nodesnum = datanum && 最终已审批状态显示
      * @param mCommonApprovalFlowBean
      */
     private void Showflownodata(CommonApprovalFlowBean mCommonApprovalFlowBean) {
-/*        if (ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())
-                && ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
-                && ListUtils.isEmpty(mCommonApprovalFlowBean.getData())){
-            try{
-                // 当保存数据但未提交时的解决方案
-                if(mCommonApprovalFlowBean.getData().size() == 0 &&
-                        mCommonApprovalFlowBean.getNodes().size() == 0 &&
-                        mCommonApprovalFlowBean.getProcesss().size() == 0 &&
-                        !status.equals("已审批")){
-                    wdd_status.setTextColor(mContext.getResources().getColor(R.color.done_approval));
-                    wdd_status.setText("未提交");
-                    resanddel_ll.setVisibility(View.VISIBLE);
-
-                    unsubmit_iv.setVisibility(View.GONE);
-                    unsubmit_iv.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            Intent intent = new Intent(activity,WorkDailyAddActivity.class);
-                            intent.putExtra("UC_Summary",summary);
-                            intent.putExtra("UC_Plan",plan);
-                            intent.putExtra("UC_Experience",experience);
-                            intent.putExtra("id",mkeyValue);
-                            intent.putExtra("resubmit","UCsubmit");
-                            startActivity(intent);
-                            finish();
-                        }
-                    });
-
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-        }*/
 
         if(!ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())
                 && !ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
@@ -556,7 +531,6 @@ public class DailydetailsActivity extends BaseActivity {
                     String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
                     String emCode = mCommonApprovalFlowBean.getNodes().get(i).getJn_dealManId();
                     if (emCode.contains(",")) {
-//                                        im_ids.add("");
                         String str[] = emCode.split(",");
                         emCode = str[0];
                         ToastMessage("多人审批，头像已显示为首个");   //该情况只有在测试账号情况下出现
@@ -573,7 +547,6 @@ public class DailydetailsActivity extends BaseActivity {
                             im_ids.add(imId);
                         } else {
                             im_ids.add("");
-//                                            ToastMessage("审批流头像获取异常，已显示为默认");
                         }
                     } catch (Exception e) {
                         e.printStackTrace();