Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

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

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.adapter;
 
 import android.content.Context;
 import android.support.v7.app.AlertDialog;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -10,10 +11,16 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
+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.util.CommonUtil;
+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.StringUtils;
 
 import java.util.List;
 
@@ -28,6 +35,7 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
     private Context mContext;
     //DBManager manager;
     private List<String> im_ids;
+    private String af_name;
 
     public List<String> getIm_ids() {
         return im_ids;
@@ -85,8 +93,39 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
         //获取 已审批节点数量 和总审批节点数
         final int nodesnum = mCommonApprovalFlowBean.getNodes().size();
         int datanum = mCommonApprovalFlowBean.getData().size();
-        int processnum = mCommonApprovalFlowBean.getProcesss().size();
-        viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODEDEALMANNAME());
+        af_name = new String();
+        if (mCommonApprovalFlowBean.getProcesss() != null && !ListUtils.isEmpty(mCommonApprovalFlowBean.getData())){
+            int pronum = mCommonApprovalFlowBean.getProcesss().size();
+            if (getCount() - position - 1<pronum && mCommonApprovalFlowBean.getProcesss().get(getCount() - position - 1).getJp_nodeDealMan() !=null){
+                String em_code = mCommonApprovalFlowBean.getProcesss().get(getCount() - position - 1).getJp_nodeDealMan();
+                String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
+                String[] selectionArgs = {em_code == null ? "":em_code, whichsys};
+                String selection = "em_code=? and whichsys=? ";
+                DBManager manager = new DBManager(mContext);
+
+                try {
+                    //获取数据库数据
+                    EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                    if (bean != null) {
+                        String imName = String.valueOf(bean.getEM_NAME());
+                        if (!StringUtils.isEmpty(imName)) {
+                            af_name = imName;
+                        }else {
+                            af_name = mCommonApprovalFlowBean.getProcesss().get(getCount() - position - 1).getJp_nodeDealMan();
+                        }
+                    }else {
+                        af_name = mCommonApprovalFlowBean.getProcesss().get(getCount() - position - 1).getJp_nodeDealMan();
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }else {
+                af_name = mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODEDEALMANNAME();
+            }
+        }else {
+            af_name = mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODEDEALMANNAME();
+        }
+        viewHolder.AppFlowName.setText(af_name);
         if (im_ids == null || im_ids.get(getCount() - position - 1).equals("")
                 || im_ids.get(getCount() - position - 1).equals("0")) {
            // viewHolder.AppFlowPhoto.setImageDrawable(new BitmapDrawable());

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

@@ -24,6 +24,7 @@ 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.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 
 import java.util.List;
@@ -37,6 +38,7 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
     private Context mContext;
     DBManager manager;
     private List<String> im_ids;
+    private String af_name;
 
     public List<String> getIm_ids() {
         return im_ids;
@@ -152,9 +154,39 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
            //获取 已审批节点数量 和总审批节点数
            final int nodesnum = mCommonApprovalFlowBean.getNodes().size();
            final int datanum = mCommonApprovalFlowBean.getData().size();
-           int processnum = mCommonApprovalFlowBean.getProcesss().size();
-           viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODEDEALMANNAME());
+           af_name = new String();
+           if (mCommonApprovalFlowBean.getProcesss() != null){
+               int pronum = mCommonApprovalFlowBean.getProcesss().size();
+               if (getCount() - position - 1<pronum && mCommonApprovalFlowBean.getProcesss().get(getCount() - position - 1).getJp_nodeDealMan() !=null){
+                   String em_code = mCommonApprovalFlowBean.getProcesss().get(getCount() - position - 1).getJp_nodeDealMan();
+                   String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
+                   String[] selectionArgs = {em_code == null ? "":em_code, whichsys};
+                   String selection = "em_code=? and whichsys=? ";
+                   DBManager manager = new DBManager(mContext);
 
+                   try {
+                       //获取数据库数据
+                       EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                       if (bean != null) {
+                           String imName = String.valueOf(bean.getEM_NAME());
+                           if (!StringUtils.isEmpty(imName)) {
+                               af_name = imName;
+                           }else {
+                               af_name = mCommonApprovalFlowBean.getProcesss().get(getCount() - position - 1).getJp_nodeDealMan();
+                           }
+                       }else {
+                           af_name = mCommonApprovalFlowBean.getProcesss().get(getCount() - position - 1).getJp_nodeDealMan();
+                       }
+                   } catch (Exception e) {
+                       e.printStackTrace();
+                   }
+               }else {
+                   af_name = mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODEDEALMANNAME();
+               }
+           }else {
+               af_name = mCommonApprovalFlowBean.getData().get(getCount() - position - 1).getJP_NODEDEALMANNAME();
+           }
+           viewHolder.AppFlowName.setText(af_name);
            if (im_ids == null || im_ids.get(getCount() - position - 1).equals("")
                    || im_ids.get(getCount() - position - 1).equals("0")) {
                // viewHolder.AppFlowPhoto.setImageDrawable(new BitmapDrawable());

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

@@ -276,7 +276,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                     .putExtra("caller", mCaller)
                                     .putExtra("id", mkeyValue)
                                     .putExtra("submittype", "resubmit"));
-                            finish();
                         }
                     }
                     break;
@@ -465,15 +464,16 @@ 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");
-                        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 (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();
+                            }
+                        }else {
+                            emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
+                        }
                         try {
                             if (emCode.contains(",")) {
 //                                im_ids.add("");

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

@@ -203,14 +203,13 @@ 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");
-                        emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
-//                        if (mCommonApprovalFlowBean.getProcesss() != null  &&
-//                                i < mCommonApprovalFlowBean.getProcesss().size() &&
-//                                    mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan() !=null){
-//                            emCode = mCommonApprovalFlowBean.getProcesss().get(i).getJp_nodeDealMan();
-//                        }else {
-//                            emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
-//                        }
+                        if (mCommonApprovalFlowBean.getProcesss() != null  &&
+                                i < mCommonApprovalFlowBean.getProcesss().size() &&
+                                    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];

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

@@ -249,7 +249,7 @@ public class WorkDailyAddActivity extends BaseActivity {
                         .setPositiveButton("确定", new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                if (!TextUtils.isEmpty(resubmit) && "unsub_tosub".equals(resubmit)){
+                                if (!TextUtils.isEmpty(resubmit) && ("unsub_tosub".equals(resubmit) ||"resubmit".equals(resubmit))){
                                     startActivity(new Intent(WorkDailyAddActivity.this,WorkDailyShowActivity.class));
                                 }else {
                                     startActivity(new Intent(WorkDailyAddActivity.this,OAActivity.class));

WeiChat/src/main/res/layout/item_comdoc_am.xml

@@ -8,7 +8,7 @@
         android:layout_marginTop="5dp"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="2"
+        android:layout_weight="1"
         android:text="开始时间："
         android:layout_marginRight="10dp"
         android:textColor="#6E6E6E"
@@ -19,7 +19,7 @@
         android:layout_marginTop="5dp"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="3"
+        android:layout_weight="2"
         android:text="2016-11-25-21:22"
         android:textColor="@color/done_approval"/>
 

WeiChat/src/main/res/values/styles.xml

@@ -317,7 +317,7 @@
 
     <style name="form_relative_right_text">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_centerVertical">true</item>
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_marginRight">20dp</item>