提交类型 修复bug

提交内容  修复在出差申请但跳往dbfind字段查找的时候，由于传的参数错误，搜索不出来的问题

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/CommonUtil.java

@@ -110,8 +110,11 @@ public class CommonUtil {
      * @author：Administrator on 2016/2/18 15:12
      */
     public static String getAppBaseUrl(Context ct) {
-        if (ct==null)return "";
-        String baseUrl =getSharedPreferences(ct, "erp_baseurl");
+        if (ct == null) return "";
+        String baseUrl = getSharedPreferences(ct, "erp_baseurl");
+//        if (BaseConfig.isDebug()) {
+////            baseUrl = "http://192.168.253.243:8080/ERP/";
+////        }
         return baseUrl;
     }
 
@@ -646,7 +649,7 @@ public class CommonUtil {
         return dateString;
     }
 
-    public static String getStringDate(Long date,String dateFormat) {
+    public static String getStringDate(Long date, String dateFormat) {
         SimpleDateFormat formatter = new SimpleDateFormat(dateFormat);
         String dateString = formatter.format(date);
         return dateString;
@@ -1065,10 +1068,10 @@ public class CommonUtil {
     public static String getMIMEType(File f) {
         String type = "";
         String fName = f.getName();
-      /* 取得扩展名 */
+        /* 取得扩展名 */
         String end = fName.substring(fName.lastIndexOf(".") + 1, fName.length()).toLowerCase();
 
-      /* 依扩展名的类型决定MimeType */
+        /* 依扩展名的类型决定MimeType */
         if (end.equals("pdf")) {
             type = "application/pdf";//
         } else if (end.equals("m4a") || end.equals("mp3") || end.equals("mid") ||
@@ -1250,7 +1253,7 @@ public class CommonUtil {
 
         datePickDialog.setOnDateTimeSetListener(new DateTimePickerDialog.OnDateTimeSetListener() {
             public void OnDateTimeSet(AlertDialog dia, long date) {
-                textView.setText(CommonUtil.getStringDate(date,dateFormat));
+                textView.setText(CommonUtil.getStringDate(date, dateFormat));
                 /** @注释：保证 初始化当前时间 */
                 datePickDialog = null;
             }
@@ -1284,8 +1287,8 @@ public class CommonUtil {
      * @desc:打电话确认框
      * @author：Arison on 2016/11/3
      */
-    public static void phoneAction( Context mContext,  String phone) {
-        SystemUtil.phoneAction(mContext,phone);
+    public static void phoneAction(Context mContext, String phone) {
+        SystemUtil.phoneAction(mContext, phone);
     }
 
 
@@ -1418,16 +1421,18 @@ public class CommonUtil {
             return 0;
         }
     }
-    public static String getTwoPointStr(double m){
-        String  strValue = "";
+
+    public static String getTwoPointStr(double m) {
+        String strValue = "";
         try {
             DecimalFormat df = new DecimalFormat("#,###.##");
-            strValue   =   df.format(m);
+            strValue = df.format(m);
             return strValue;
         } catch (Exception e) {
             return strValue;
         }
     }
+
     /*获取账套，erp的账套  b2b的公司uu号*/
     public static String getMaster() {
         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
@@ -1440,7 +1445,7 @@ public class CommonUtil {
     public static String getEmcode() {
         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         String emcode = isB2b ? CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu") : CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
-        if (emcode==null)emcode="";
+        if (emcode == null) emcode = "";
         return emcode;
     }
 
@@ -1507,8 +1512,9 @@ public class CommonUtil {
 
     /**
      * 将double格式化为指定小数位的String，不足小数位用0补全
-     * @param v  需要格式化的数字
-     * @param scale  小数点后保留几位
+     *
+     * @param v     需要格式化的数字
+     * @param scale 小数点后保留几位
      * @return
      */
     public static String roundByScale(double v, int scale) {
@@ -1516,11 +1522,11 @@ public class CommonUtil {
             throw new IllegalArgumentException(
                     "The   scale   must   be   a   positive   integer   or   zero");
         }
-        if(scale == 0){
+        if (scale == 0) {
             return new DecimalFormat("0").format(v);
         }
         String formatStr = "0.";
-        for(int i=0;i<scale;i++){
+        for (int i = 0; i < scale; i++) {
             formatStr = formatStr + "0";
         }
         return new DecimalFormat(formatStr).format(v);

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Jun 12 13:48:10 CST 2018
+#Wed Jun 13 11:08:53 CST 2018
 debugName=502
-versionName=631
+versionName=632
 debugCode=502
-versionCode=172
+versionCode=173

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -106,7 +106,7 @@ public class CommonUtil {
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
 //        if (BaseConfig.isDebug()){
-//            baseUrl="http://192.168.253.250:8080/ERP/";
+//            baseUrl="http://192.168.253.243:8080/ERP/";
 //        }
 //        baseUrl = "http://192.168.253.41:8080/ERP/";
 

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalActivity.java

@@ -12,6 +12,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
@@ -186,8 +187,8 @@ public class ApprovalActivity extends BaseActivity implements IApproval, Approva
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-//        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN |
-//                WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN |
+                WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         setContentView(R.layout.activity_approval);
         initView();
     }

app_modular/apputils/src/main/java/com/modular/apputils/activity/SelectNetAcitivty.java

@@ -4,23 +4,17 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
-import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -28,17 +22,10 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
-import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.common.data.TextUtil;
-import com.common.system.PermissionUtil;
-import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
-import com.core.net.http.http.OAHttpHelper;
-import com.core.net.http.http.OnHttpResultListener;
-import com.core.net.http.http.Request;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.widget.EmptyLayout;
@@ -54,11 +41,7 @@ import com.modular.apputils.R;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
-import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
-
-import java.net.URLEncoder;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -211,6 +194,7 @@ public class SelectNetAcitivty extends OABaseActivity {
                 .add("sessionUser", CommonUtil.getEmcode())
                 .add("sessionId", sessionId)
                 .connectTimeout(5000)
+                .isDebug(true)
                 .readTimeout(5000)
                 .build();
         loadSearch(page = 1, lastKey = "");
@@ -280,6 +264,7 @@ public class SelectNetAcitivty extends OABaseActivity {
                 .header("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"))
                 .add("condition", condition)
                 .add("ob", "")
+                .isDebug(true)
                 .add("_config", "")
                 .add("page", page)
                 .add("pageSize", dataForm ? 10000 : 20)

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/TravelDataFormDetailActivity.java

@@ -1195,7 +1195,7 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
                                 startActivityForResult(new Intent(ct, SelectNetAcitivty.class)
                                                 .putExtra("fieldKey", data.getField())
                                                 .putExtra("caller", caller)
-                                                .putExtra("isDevice", true)
+                                                .putExtra("isDevice", false)
                                                 .putExtra("device", data.getName().equals("设备编号"))
                                                 .putExtra("isForm", true)
                                         , 90);
@@ -1360,7 +1360,6 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
                     } else {
                         model.muchInputTv.setVisibility(View.GONE);
                     }
-                    LogUtil.i(data.getName()+"=getReadonly="+data.getReadonly());
                     //判断是否可编辑
                     if (TextUtils.isEmpty(data.getReadonly()) || !"T".equals(data.getReadonly())) {
                         //可编辑