提交打卡签到

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

@@ -62,7 +62,19 @@ public class ChangeMobileActivity extends BaseActivity {
                     Toast.makeText(ct, R.string.change_mobile_ok, Toast.LENGTH_SHORT).show();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    Crouton.makeText(ct, "请求异常");
+                    progressDialog.dismiss();
+                    if (!StringUtils.isEmpty(message))
+                        Crouton.makeText(ct, message);
+//                    JsonValidator validator = new JsonValidator();
+//                    if (validator.validate(message)) {
+//                        Log.i("gongpengming","validate(message");
+//                        if (JSON.parseObject(message).containsKey("exceptionInfo")) {
+//                            Log.i("gongpengming","containsKey(message");
+//                            String error = JSON.parseObject(message).getString("exceptionInfo");
+//                            if (!StringUtils.isEmpty(error))
+//                                Crouton.makeText(ct, error);
+//                        }
+//                    }
                     break;
                 default:
                     break;

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

@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.EditText;
@@ -48,6 +47,7 @@ public class SaveMeetActivity extends BaseActivity {
     @ViewInject(R.id.follow_et)
     private EditText follow_et;
     private int id;
+    private String noid = null;
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -66,23 +66,21 @@ public class SaveMeetActivity extends BaseActivity {
                     submitMeeting(id);
                     break;
                 case 0x13:
-//                    Crouton.makeText(SaveMeetActivity.this, "保存会议纪要成功");
                     try {
                         if (!StringUtils.isEmpty(message) && message.length() > 10) {
                             JsonValidator validator = new JsonValidator();
                             if (validator.validate(message)) {
                                 JSONArray array = JSON.parseObject(message).getJSONArray("assigns");
                                 JSONObject object = array.getJSONObject(0);
+                                noid = object.getString("JP_NODEID");
                                 JSONArray data = object.getJSONArray("JP_CANDIDATES");
                                 sendToSelect(data);
                             }
                         } else {//只有一个审批人
-                            Crouton.makeText(SaveMeetActivity.this, "保存会议纪要成功");
+                            submitMeeting(id);
                         }
                     } catch (Exception e) {
-                        Log.i("gongpengming", "e=" + e.getMessage());
-                    } finally {
-
+                        ToastMessage("解析数据错误");
                     }
                     break;
                 case 0x14:
@@ -102,8 +100,9 @@ public class SaveMeetActivity extends BaseActivity {
                     }
                     break;
                 case 0x17://提交审批流
-                    judgeApprovers();
-//                    finish();
+                    finish();
+//                    TODO 先关闭发布版本
+//                    judgeApprovers();
                     break;
                 default:
                     JsonValidator validator = new JsonValidator();
@@ -147,7 +146,7 @@ public class SaveMeetActivity extends BaseActivity {
         Map<String, Object> param = new HashMap<>();
         Map<String, Object> params = new HashMap<>();
         params.put("em_code", emName);
-        params.put("nodeId", id);
+        params.put("nodeId", noid);
         param.put("_noc", 1);
         param.put("params", StringUtils.mapToJson(params));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
@@ -155,7 +154,7 @@ public class SaveMeetActivity extends BaseActivity {
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, 0x14, null, null, "post");
     }
 
-    //保存会议后提交
+    //保存会议后提交审批流
     private void submitMeeting(int id) {
         String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "oa/meeting/submitMeetingDoc.action";
         Map<String, Object> param = new HashMap<>();
@@ -312,10 +311,8 @@ public class SaveMeetActivity extends BaseActivity {
         if (StringUtils.isEmpty(text)) return;
         Pattern pattern = Pattern.compile("(?<=\\()(.+?)(?=\\))");
         Matcher matcher = pattern.matcher(text);
-        Log.i("gongpengmong", "text=" + text);
         while (matcher.find()) {
             String name = matcher.group();
-            Log.i("gongpengmong", "name=" + name);
             if (!StringUtils.isEmpty(name))
                 selectApprovers(name);
         }
@@ -329,8 +326,6 @@ public class SaveMeetActivity extends BaseActivity {
             if (b == null) return;
             String name = StringUtils.isEmpty(b.getName()) ? "" : b.getName();
             getEmnameByReturn(name);
-            Log.i("gongpengming", "回来了" + name);
-
         }
     }
 }