修改审批流代码钱备份

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

@@ -884,7 +884,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 break;
             case R.id.outoffice:  //外勤签到
                 boolean is = PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false);
-                if (is && AppConfig.IS_MISSION) {
+                if (isB2b || is ) {
                     intent = new Intent(activity, MissionActivity.class);
                     intent.putExtra("flag", 1);
                 } else {

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

@@ -669,20 +669,21 @@ public class ViewUtil {
     public static void LoginSucess(Message msg) {
         String json = msg.getData().getString("result");
         CommonUtil.setSharedPreferences(ct, "loginJson", json);
+        String phone = msg.getData().getString("phone");
+        String password = msg.getData().getString("password");
         try {
             JSONArray array = JSON.parseArray(json);
             if (!ListUtils.isEmpty(array)) {
                 JSONObject object = array.getJSONObject(0);
                 if (object != null && object.containsKey("userName")) {
-                    String userName = object.getString("userName");
-                    CommonUtil.setSharedPreferences(ct, "erp_emname", userName);
+                    String userName = getNameByB2b(object.getString("userName"), phone);
+                    if (!StringUtils.isEmpty(userName))
+                        CommonUtil.setSharedPreferences(ct, "erp_emname", userName);
                 }
             }
         } catch (Exception e) {
 
         }
-        String phone = msg.getData().getString("phone");
-        String password = msg.getData().getString("password");
         if (new JsonValidator().validate(json)) {
             showDialogCompany(json, phone, password);
         } else {
@@ -690,6 +691,28 @@ public class ViewUtil {
         }
     }
 
+    //TODO 针对于平台的测试、正式数据库不一致
+    private static String getNameByB2b(String userName, String phone) {
+        if (StringUtils.isEmpty(phone)) return userName;
+        LogUtil.d("phone=" + phone);
+        if (phone.equals("13111110001")) {
+            return "吕全明";
+        } else if (phone.equals("13111110002")) {
+            return "曹秋莲";
+        } else if (phone.equals("13111110003")) {
+            return "陈爱平";
+        } else if (phone.equals("13111110004")) {
+            return "CS008";
+        } else if (phone.equals("13111110005")) {
+            return "CS009";
+        } else if (phone.equals("15012345676")) {
+            return "品质";
+        } else if (phone.equals("15012345678")) {
+            return "移动测试员";
+        }
+        return userName;
+    }
+
     /**
      * @desc:解析登录数据
      * @author：Arison on 2017/3/6

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

@@ -31,6 +31,8 @@ import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
 import com.xzjmyk.pm.activity.ui.tool.ThreadUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
+import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 import com.xzjmyk.pm.basepedo.service.StepService;
 
 import java.util.List;
@@ -304,7 +306,8 @@ public class AutoErpService extends Service {
                             log("自动外勤 plans==" + (ListUtils.isEmpty(plans) ? 0 : plans.size()));
                             //符合外勤判断
                             //判断是否自动外勤
-                            boolean isAuto = PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false);
+                            boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
+                            boolean isAuto = isB2b || PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false);
                             if (isAuto) {
                                 MissionModel mission = getReckonAutoUtil().reckonMission(plans);
                                 if (mission != null) {//TODO 符合外勤签到