合并

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

@@ -317,7 +317,6 @@ public class AddFlihtsPresenter implements HttpHandler.OnResultListener {
                         namBbuilder.append(aas[i] + ",");
                 }
             }
-            Log.i("gongpengming", "namBbuilder=" + namBbuilder.toString());
             return removieLast(namBbuilder).toString();
         }
         return null;
@@ -327,8 +326,8 @@ public class AddFlihtsPresenter implements HttpHandler.OnResultListener {
         if (!ListUtils.isEmpty(employeesList)) {
             StringBuilder employee = new StringBuilder();
             for (int i = 0; i < employeesList.size(); i++) {
-                employee.append((isName ? employeesList.get(i).getEmName()
-                        : employeesList.get(i).getEmCode()) + ",");
+                employee.append("\'"+(isName ? employeesList.get(i).getEmName()
+                        : employeesList.get(i).getEmCode()) +"\'"+ ",");
             }
             removieLast(employee);
             return employee.toString();
@@ -347,7 +346,7 @@ public class AddFlihtsPresenter implements HttpHandler.OnResultListener {
         if (!ListUtils.isEmpty(hrorgsList)) {
             StringBuilder hrorgs = new StringBuilder();
             for (int i = 0; i < hrorgsList.size(); i++) {
-                hrorgs.append((isName ? hrorgsList.get(i).getName() : hrorgsList.get(i).getCode()) + ",");
+                hrorgs.append("\'"+(isName ? hrorgsList.get(i).getName() : hrorgsList.get(i).getCode()) +"\'"+ ",");
             }
             removieLast(hrorgs);
             return hrorgs.toString();

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

@@ -22,6 +22,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil.getJson2Text;
+
 /**
  * Created by Bitliker on 2017/1/16.
  */
@@ -136,16 +138,34 @@ public class FlightsPresernter implements HttpHandler.OnResultListener {
         EmployeesModel employeesModel = new EmployeesModel();
         EmployeesModel hrorgsModel = new EmployeesModel();
         timeModel.setEarlyTime(OACheckUtil.getJsonIntager(object, "wd_earlytime"));
-        timeModel.setWd_ondutyone(OACheckUtil.getJson2Text(object, "wd_ondutyone"));
-        timeModel.setWd_offdutyone(OACheckUtil.getJson2Text(object, "wd_offdutyone"));
-        timeModel.setWd_ondutytwo(OACheckUtil.getJson2Text(object, "wd_ondutytwo"));
-        timeModel.setWd_offdutytwo(OACheckUtil.getJson2Text(object, "wd_offdutytwo"));
-        timeModel.setWd_ondutythree(OACheckUtil.getJson2Text(object, "wd_ondutythree"));
-        timeModel.setWd_offdutythree(OACheckUtil.getJson2Text(object, "wd_offdutythree"));
-        employeesModel.setEmployeecode(OACheckUtil.getJson2Text(object, "wd_emcode"));
-        employeesModel.setEmployeeNames(OACheckUtil.getJson2Text(object, "wd_man"));
-        hrorgsModel.setEmployeecode(OACheckUtil.getJson2Text(object, "wd_defaultorcode"));
-        hrorgsModel.setEmployeeNames(OACheckUtil.getJson2Text(object, "wd_defaultor"));
+        timeModel.setWd_ondutyone(getJson2Text(object, "wd_ondutyone"));
+        timeModel.setWd_offdutyone(getJson2Text(object, "wd_offdutyone"));
+        timeModel.setWd_ondutytwo(getJson2Text(object, "wd_ondutytwo"));
+        timeModel.setWd_offdutytwo(getJson2Text(object, "wd_offdutytwo"));
+        timeModel.setWd_ondutythree(getJson2Text(object, "wd_ondutythree"));
+        timeModel.setWd_offdutythree(getJson2Text(object, "wd_offdutythree"));
+       String emcodes =OACheckUtil.getJson2Text(object, "wd_emcode");
+        if (StringUtils.isEmpty(emcodes))
+            emcodes=OACheckUtil.getJson2Text(object, "emcodes");
+
+        String emnames =OACheckUtil.getJson2Text(object, "wd_man");
+        if (StringUtils.isEmpty(emnames))
+            emcodes=OACheckUtil.getJson2Text(object, "emnames");
+
+        employeesModel.setEmployeecode(emcodes);
+        employeesModel.setEmployeeNames(emnames);
+
+        String emdefaultorcodes =OACheckUtil.getJson2Text(object, "wd_defaultorcode");
+        if (StringUtils.isEmpty(emdefaultorcodes))
+            emdefaultorcodes=OACheckUtil.getJson2Text(object, "emdefaultorcodes");
+
+        String emdefaultors =OACheckUtil.getJson2Text(object, "wd_defaultor");
+        if (StringUtils.isEmpty(emdefaultors))
+            emdefaultors=OACheckUtil.getJson2Text(object, "emdefaultors");
+
+        hrorgsModel.setEmployeecode(emdefaultorcodes);
+        hrorgsModel.setEmployeeNames(emdefaultors);
+
         model.setId(OACheckUtil.getJsonIntager(object, "id"));
 //        model.setCount(OACheckUtil.getJsonIntager(object, "wd_pcount"));
         model.setCode(OACheckUtil.getJson2Text(object, "wd_code"));
@@ -183,12 +203,12 @@ public class FlightsPresernter implements HttpHandler.OnResultListener {
         EmployeesModel hrorgsModel = new EmployeesModel();
         timeModel.setEarlyTime(OACheckUtil.getJsonIntager(object, "wd_earlytime"));
         timeModel.setEarlyTime(OACheckUtil.getJsonIntager(object, "wd_earlytime"));
-        timeModel.setWd_ondutyone(OACheckUtil.getJson2Text(object, "wd_ondutyone"));
-        timeModel.setWd_offdutyone(OACheckUtil.getJson2Text(object, "wd_offdutyone"));
-        timeModel.setWd_ondutytwo(OACheckUtil.getJson2Text(object, "wd_ondutytwo"));
-        timeModel.setWd_offdutytwo(OACheckUtil.getJson2Text(object, "wd_offdutytwo"));
-        timeModel.setWd_ondutythree(OACheckUtil.getJson2Text(object, "wd_ondutythree"));
-        timeModel.setWd_offdutythree(OACheckUtil.getJson2Text(object, "wd_offdutythree"));
+        timeModel.setWd_ondutyone(getJson2Text(object, "wd_ondutyone"));
+        timeModel.setWd_offdutyone(getJson2Text(object, "wd_offdutyone"));
+        timeModel.setWd_ondutytwo(getJson2Text(object, "wd_ondutytwo"));
+        timeModel.setWd_offdutytwo(getJson2Text(object, "wd_offdutytwo"));
+        timeModel.setWd_ondutythree(getJson2Text(object, "wd_ondutythree"));
+        timeModel.setWd_offdutythree(getJson2Text(object, "wd_offdutythree"));
         model.setTimeModel(timeModel);
         model.setEmployeesModel(employeesModel);
         model.setHrorgsModel(hrorgsModel);
@@ -208,18 +228,18 @@ public class FlightsPresernter implements HttpHandler.OnResultListener {
             timeModel.setWd_ondutythree(getByClass(o, true));
             timeModel.setWd_offdutythree(getByClass(o, false));
         }
-        employeesModel.setEmployeecode(OACheckUtil.getJson2Text(object, "defaultmancode"));
-        employeesModel.setEmployeeNames(OACheckUtil.getJson2Text(object, "defaultman"));
+        employeesModel.setEmployeecode(getJson2Text(object, "defaultmancode"));
+        employeesModel.setEmployeeNames(getJson2Text(object, "defaultman"));
 //        hrorgsModel.setEmployeecode(OACheckUtil.getJson2Text(object, "hrorgcode"));
 //        hrorgsModel.setEmployeeNames(OACheckUtil.getJson2Text(object, "hrorgname"));
         model.setId(OACheckUtil.getJsonIntager(object, "wd_id"));
-        model.setCode(OACheckUtil.getJson2Text(object, "wd_code"));
+        model.setCode(getJson2Text(object, "wd_code"));
         model.setTimeModel(timeModel);
-        model.setDay(OACheckUtil.getJson2Text(object, "wd_day"));//返回为1，2，3
+        model.setDay(getJson2Text(object, "wd_day"));//返回为1，2，3
         model.setEmployeesModel(employeesModel);
         model.setHrorgsModel(hrorgsModel);
         model.setType(2);
-        model.setName(OACheckUtil.getJson2Text(object, "wd_name"));
+        model.setName(getJson2Text(object, "wd_name"));
 
         try {
             String names = employeesModel.getEmployeeNames();