尝试从已审批的 process 中获取申请人个人em_code

 显示头像部门前，备份1

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

@@ -70,15 +70,15 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
     public View getView(final int position, View convertView, ViewGroup parent) {
         ViewHolder viewHolder = null;
         if (convertView == null) {
-            convertView = View.inflate(mContext, R.layout.item_daily_details_approval_flow, null);
+            convertView = View.inflate(mContext, R.layout.item_common_doc_approval_flow, null);
             viewHolder = new ViewHolder();
-            viewHolder.AppFlowNode = (ImageView) convertView.findViewById(R.id.item_daily_details_approval_flow_node_img);
-            viewHolder.AppFlowPhoto = (ImageView) convertView.findViewById(R.id.item_daily_details_approval_flow_photo_img);
-            viewHolder.AppFlowName = (TextView) convertView.findViewById(R.id.item_daily_details_approval_flow_name_tv);
-            viewHolder.AppFlowStatus = (TextView) convertView.findViewById(R.id.item_daily_details_approval_flow_status_tv);
-            viewHolder.AppFlowTime = (TextView) convertView.findViewById(R.id.item_daily_details_approval_flow_time_tv);
+            viewHolder.AppFlowNode = (ImageView) convertView.findViewById(R.id.item_common_doc_approval_flow_node_img);
+            viewHolder.AppFlowPhoto = (ImageView) convertView.findViewById(R.id.item_dcommon_doc_approval_flow_photo_img);
+            viewHolder.AppFlowName = (TextView) convertView.findViewById(R.id.item_common_doc_approval_flow_name_tv);
+            viewHolder.AppFlowStatus = (TextView) convertView.findViewById(R.id.item_common_doc_approval_flow_status_tv);
+            viewHolder.AppFlowTime = (TextView) convertView.findViewById(R.id.item_common_doc_approval_flow_time_tv);
             viewHolder.AppFlowDescriptionll = (LinearLayout) convertView.findViewById(R.id.Description_ll);
-            viewHolder.AppFlowDescriptiontv = (TextView) convertView.findViewById(R.id.item_daily_details_approval_flow_statusDescription_tv);
+            viewHolder.AppFlowDescriptiontv = (TextView) convertView.findViewById(R.id.item_common_doc_approval_flow_statusDescription_tv);
             convertView.setTag(viewHolder);
         } else {
             viewHolder = (ViewHolder) convertView.getTag();

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

@@ -156,7 +156,21 @@ public class CommonDocDetailsActivity extends BaseActivity {
                         String emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
                         if( emCode.contains(",")){
                             im_ids.add("");
-                            ToastMessage("多人审批，头像已显示为默认");   //该情况只有在测试账号 只有一个审批人情况下出现
+                            String str[] = emCode.split(",");
+                            emCode = str[0];
+                            ToastMessage("多人审批，头像已显示为首个");   //该情况只有在测试账号情况下出现
+                            String[] selectionArgs = {emCode, whichsys};
+                            String selection = "em_code=? and whichsys=? ";
+                            //获取数据库数据
+                            EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                            if (bean != null) {
+                                String imId = String.valueOf(bean.getEm_IMID());
+                                Log.i("todo", "imId=" + imId);
+                                im_ids.add(imId);
+                            }else {
+                                im_ids.add("");
+                                  ToastMessage("头像获取异常，已显示为默认");
+                            }
                         }else {
 
                             String[] selectionArgs = {emCode, whichsys};
@@ -169,7 +183,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                                 im_ids.add(imId);
                             }else {
                                 im_ids.add("");
-                                //  ToastMessage("头像获取异常，已显示为默认男");
+                                  ToastMessage("头像获取异常，已显示为默认");
                             }
                         }
 

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

@@ -206,8 +206,22 @@ public class DailydetailsActivity extends BaseActivity {
                                     String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
                                     String emCode = mCommonApprovalFlowBean.getData().get(i).getJP_NODEDEALMAN();
                                     if( emCode.contains(",")){
-                                        im_ids.add("");
-                                        ToastMessage("多人审批，头像已显示为默认");   //该情况只有在测试账号 只有一个审批人情况下出现
+//                                        im_ids.add("");
+                                        String str[] = emCode.split(",");
+                                        emCode = str[0];
+                                        ToastMessage("多人审批，头像已显示为首个");   //该情况只有在测试账号情况下出现
+                                        String[] selectionArgs = {emCode, whichsys};
+                                        String selection = "em_code=? and whichsys=? ";
+                                        //获取数据库数据
+                                        EmployeesEntity bean = manager.selectForEmployee(selectionArgs, selection);
+                                        if (bean != null) {
+                                            String imId = String.valueOf(bean.getEm_IMID());
+                                            Log.i("todo", "imId=" + imId);
+                                            im_ids.add(imId);
+                                        }else {
+                                            im_ids.add("");
+                                            ToastMessage("头像获取异常，已显示为默认");
+                                        }
                                     }else {
 
                                         String[] selectionArgs = {emCode, whichsys};
@@ -220,7 +234,7 @@ public class DailydetailsActivity extends BaseActivity {
                                             im_ids.add(imId);
                                         }else {
                                             im_ids.add("");
-                                          //  ToastMessage("头像获取异常，已显示为默认男");
+                                            ToastMessage("头像获取异常，已显示为默认");
                                         }
                                     }
 

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

@@ -107,7 +107,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="visible"
-                android:background="#ebe9e9">
+               >
             </com.xzjmyk.pm.activity.view.MyListView>
 
         </LinearLayout>

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

@@ -2,93 +2,94 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#ebe9e9"
-    android:orientation="vertical">
-
+    android:background="@color/bg_main"
+    android:orientation="vertical"
+    >
     <LinearLayout
         android:id="@+id/node_ll"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:gravity="center"
         android:layout_marginLeft="20dp"
-        android:layout_marginTop="20dp"
-        android:gravity="center">
-
+        android:layout_marginTop="20dp">
         <ImageView
             android:id="@+id/item_common_doc_approval_flow_node_img"
             android:layout_width="15dp"
             android:layout_height="15dp"
+            android:src="@drawable/node_none3"
             android:contentDescription="@string/app_name"
-            android:src="@drawable/node_none3" />
+            />
 
     </LinearLayout>
 
 
     <ImageView
-        android:id="@+id/item_common_doc_approval_flow_photo_img"
+        android:id="@+id/item_dcommon_doc_approval_flow_photo_img"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:layout_marginBottom="10dp"
+        android:src="@drawable/common_header_boy"
+        android:contentDescription="@string/app_name"
         android:layout_marginLeft="15dp"
-        android:layout_marginTop="10dp"
         android:layout_toRightOf="@id/node_ll"
-        android:background="@drawable/avatar_normal"
-        android:contentDescription="@string/app_name" />
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp" />
 
     <TextView
         android:id="@+id/item_common_doc_approval_flow_name_tv"
         android:layout_width="120dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="5dp"
+        android:layout_toRightOf="@+id/item_dcommon_doc_approval_flow_photo_img"
         android:singleLine="true"
         android:ellipsize="end"
         android:textColor="#575757"
         android:textSize="@dimen/text_hine"
         android:layout_marginTop="10dp"
-        android:layout_toRightOf="@+id/item_common_doc_approval_flow_photo_img"
 
         />
-
     <TextView
         android:id="@+id/item_common_doc_approval_flow_status_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/item_common_doc_approval_flow_name_tv"
         android:layout_marginLeft="5dp"
-        android:layout_marginTop="4dp"
-        android:layout_toRightOf="@+id/item_common_doc_approval_flow_photo_img"
+        android:layout_toRightOf="@+id/item_dcommon_doc_approval_flow_photo_img"
+        android:layout_below="@id/item_common_doc_approval_flow_name_tv"
         android:textColor="@color/text_main"
-        android:textSize="@dimen/text_hine" />
-
+        android:textSize="@dimen/text_hine"
+        android:layout_marginTop="4dp"/>
     <LinearLayout
         android:id="@+id/Description_ll"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/item_common_doc_approval_flow_name_tv"
-        android:layout_toRightOf="@id/item_common_doc_approval_flow_status_tv"
         android:orientation="horizontal"
-        android:visibility="gone">
+        android:layout_toRightOf="@id/item_common_doc_approval_flow_status_tv"
+        android:layout_below="@id/item_common_doc_approval_flow_name_tv"
+        android:visibility="gone"
+        >
 
         <TextView
             android:id="@+id/left_parenthesis_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text=" (" />
-
+            android:text=" ("
+            android:visibility="gone"/>
         <TextView
             android:id="@+id/item_common_doc_approval_flow_statusDescription_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
-            android:layout_marginTop="4dp"
+            android:singleLine="true"
+            android:ellipsize="end"
             android:text="多休息"
             android:textColor="@color/text_main"
-            android:textSize="@dimen/text_hine" />
-
+            android:textSize="@dimen/text_hine"
+            android:layout_marginTop="4dp" />
         <TextView
             android:id="@+id/right_parenthesis_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text=" )" />
+            android:text=" )"
+            android:visibility="gone"/>
 
     </LinearLayout>
 
@@ -99,8 +100,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_marginRight="10dp"
-        android:layout_marginTop="10dp"
         android:textColor="#9F9595"
-        android:textSize="@dimen/text_hine" />
+        android:textSize="@dimen/text_hine"
+        android:layout_marginTop="10dp"
+        />
 
 </RelativeLayout>