bug 已修复

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

@@ -633,20 +633,19 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     String jn_dealresult = jsonArray.getJSONObject(position).getString("JN_DEALRESULT");
                     int done_emid = OACheckUtil.getJsonIntager(jsonArray.getJSONObject(position), "EM_IMID");
                     model.name.setText(jn_dealmanname + "的" + jp_name);
-                    Long L = TimeUtils.s_str_2_long(jn_dealtime);
-                    model.date.setText(DateFormatUtil.getStrDate4Date(new Date(L), "MM-dd HH:mm"));
-//                    model.date.setText(jn_dealtime);
+                    if (!StringUtils.isEmpty(jn_dealtime)){
+                        Long L = TimeUtils.s_str_2_long(jn_dealtime);
+                        model.date.setText(DateFormatUtil.getStrDate4Date(new Date(L), "MM-dd HH:mm"));
+                    }else {
+                        model.date.setText("");
+                    }
                     if (!StringUtils.isEmpty(jn_dealresult)) {
                         if ("不同意".equals(jn_dealresult)) {
-//                            CommonUtil.textSpanForStyle(model.status, getString(R.string.status_approved) + "(" + jn_dealresult + ")",
-//                                    jn_dealresult, mContext.getResources().getColor(R.color.red));
                             model.status.setTextColor(getResources().getColor(R.color.red));
                             model.status.setText("已拒绝");
 
                         } else {
                             if ("变更处理人".equals(jn_dealresult)) {
-//                                CommonUtil.textSpanForStyle(model.status, getString(R.string.status_approved) + "(" + jn_dealresult + ")",
-//                                        jn_dealresult, mContext.getResources().getColor(R.color.done_approval));
                                 model.status.setTextColor(getResources().getColor(R.color.done_approval));
                                 if (!StringUtils.isEmpty(jsonArray.getJSONObject(position).getString("JN_OPERATEDDESCRIPTION"))) {
                                     model.status.setText("已变更处理人（" + jsonArray.getJSONObject(position).getString("JN_OPERATEDDESCRIPTION") + ")");
@@ -654,8 +653,6 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                                     model.status.setText("已变更处理人");
                                 }
                             } else {
-//                                CommonUtil.textSpanForStyle(model.status, getString(R.string.status_approved) + "(" + jn_dealresult + ")",
-//                                        jn_dealresult, mContext.getResources().getColor(R.color.blue));
                                 model.status.setTextColor(getResources().getColor(R.color.titleBlue));
                                 model.status.setText("已同意");
                             }
@@ -705,7 +702,6 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                             status = " ";
                         }
                         if (!StringUtils.isEmpty(name)) name = name.substring(0, name.length() - 2);
-//                        model.name.setText(name + "-" + code);
                         model.name.setText(name);
                         if (time != null) {
                             model.date.setText(DateFormatUtil.getStrDate4Date(new Date(time), "MM-dd HH:mm"));
@@ -713,8 +709,6 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                             model.date.setText("");
                         }
                         if (status.contains("未通过")) {
-//                            CommonUtil.textSpanForStyle(model.status, status,
-//                                    status, mContext.getResources().getColor(R.color.red));
                             model.status.setTextColor(mContext.getResources().getColor(R.color.red));
 
                         }