老版通用表单多选展示逻辑

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Sat Jul 20 17:37:53 CST 2019
+#Thu Aug 08 11:00:03 CST 2019
 debugName=972
-versionName=692
+versionName=693
 debugCode=972
-versionCode=247
+versionCode=248

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

@@ -1077,9 +1077,12 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
                         }
                     }
                     LogUtil.d(str.toString());
-
-                    Toast.makeText(ct, "下拉项：" + datas.get(id - 1).getName() + "返回值：" + str.toString(), Toast.LENGTH_LONG).show();
-                    mAdapter.notifyDataSetChanged();
+                    try {
+                        mAdapter.getmListData().get(currentGroupId).getDatas().get(id - 1).setValue(str.toString());
+                        mAdapter.notifyDataSetChanged();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
 //                    mHandler.postDelayed(new Runnable() {
 //                        @Override
 //                        public void run() {
@@ -2473,7 +2476,7 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
                                 param.put("page", "1");
                                 param.put("which", "form");
                                 param.put("condition", "1=1");
-                                param.put("pageSize", "30");
+                                param.put("pageSize", "1000");
                                 param.put("field", data.getField());
                                 Bundle bundle = new Bundle();
                                 bundle.putSerializable("param", param);
@@ -2484,6 +2487,7 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
                                 } else {
                                     intent.putExtra("isSingle", false);
                                 }
+                                currentGroupId = data.getGroupId();
 
                                 intent.putExtra("reid", R.style.OAThemeMeet);
                                 intent.putExtras(bundle);
@@ -2524,7 +2528,7 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
                                     }
                                     param.put("page", "1");
                                     param.put("condition", "1=1");
-                                    param.put("pageSize", "30");
+                                    param.put("pageSize", "1000");
                                     param.put("field", data.getField());
                                     Bundle bundle = new Bundle();
                                     bundle.putSerializable("param", param);

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

@@ -1336,7 +1336,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 param.put("page", "1");
                                 param.put("which", "form");
                                 param.put("condition", "1=1");
-                                param.put("pageSize", "30");
+                                param.put("pageSize", "1000");
                                 param.put("field", data.getField());
                                 Bundle bundle = new Bundle();
                                 bundle.putSerializable("param", param);
@@ -1348,6 +1348,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     intent.putExtra("isSingle", false);
                                 }
 
+                                currentGroupId = data.getGroupId();
                                 intent.putExtra("reid", R.style.OAThemeMeet);
                                 intent.putExtras(bundle);
                                 intent.putExtra("key", "combdatas");
@@ -1387,7 +1388,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     }
                                     param.put("page", "1");
                                     param.put("condition", "1=1");
-                                    param.put("pageSize", "30");
+                                    param.put("pageSize", "1000");
                                     param.put("field", data.getField());
                                     Bundle bundle = new Bundle();
                                     bundle.putSerializable("param", param);
@@ -1669,14 +1670,18 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                             if (i == (muliData.size() - 1)) {
                                 str.append(muliData.get(i).getName());
                             } else {
-                                str.append(muliData.get(i).getName() + ",");
+                                str.append(muliData.get(i).getName() + "#");
                             }
 
                         }
                     }
                     LogUtil.d(str.toString());
-//                    Toast.makeText(ct, "下拉项：" + datas.get(id - 1).getName() + "返回值：" + str.toString(), Toast.LENGTH_LONG).show();
-                    mAdapter.notifyDataSetChanged();
+                    try {
+                        mAdapter.getmListData().get(currentGroupId).getDatas().get(id - 1).setValue(str.toString());
+                        mAdapter.notifyDataSetChanged();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
                 break;
             case 0x25:

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

@@ -1231,7 +1231,7 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
                                 param.put("page", "1");
                                 param.put("which", "form");
                                 param.put("condition", "1=1");
-                                param.put("pageSize", "30");
+                                param.put("pageSize", "1000");
                                 param.put("field", data.getField());
                                 Bundle bundle = new Bundle();
                                 bundle.putSerializable("param", param);
@@ -1242,6 +1242,7 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
                                 } else {
                                     intent.putExtra("isSingle", false);
                                 }
+                                currentGroupId = data.getGroupId();
 
                                 intent.putExtra("reid", R.style.OAThemeMeet);
                                 intent.putExtras(bundle);
@@ -1282,7 +1283,7 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
                                     }
                                     param.put("page", "1");
                                     param.put("condition", "1=1");
-                                    param.put("pageSize", "30");
+                                    param.put("pageSize", "1000");
                                     param.put("field", data.getField());
                                     Bundle bundle = new Bundle();
                                     bundle.putSerializable("param", param);
@@ -1535,10 +1536,10 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
                                     sa_custaddress = i + 1;
                                 }
                             }
-                            if (sa_custname>0){
+                            if (sa_custname > 0) {
                                 mAdapter.getmListData().get(currentGroupId).getDatas().get(sa_custname - 1).setValue(cu_name);
                             }
-                            if (sa_custaddress>0){
+                            if (sa_custaddress > 0) {
                                 mAdapter.getmListData().get(currentGroupId).getDatas().get(sa_custaddress - 1).setValue(cu_address);
                             }
                             mAdapter.notifyDataSetChanged();
@@ -1554,19 +1555,21 @@ public class TravelDataFormDetailActivity extends BaseActivity implements View.O
                     StringBuilder str = new StringBuilder("");
                     if (!ListUtils.isEmpty(muliData)) {
                         for (int i = 0; i < muliData.size(); i++) {
-                            LogUtil.d(muliData.get(i).getName());
                             if (i == (muliData.size() - 1)) {
                                 str.append(muliData.get(i).getName());
                             } else {
-                                str.append(muliData.get(i).getName() + ",");
+                                str.append(muliData.get(i).getName() + "#");
                             }
 
                         }
                     }
                     LogUtil.d(str.toString());
-
-                    Toast.makeText(ct, "下拉项：" + datas.get(id - 1).getName() + "返回值：" + str.toString(), Toast.LENGTH_LONG).show();
-                    mAdapter.notifyDataSetChanged();
+                    try {
+                        mAdapter.getmListData().get(currentGroupId).getDatas().get(id - 1).setValue(str.toString());
+                        mAdapter.notifyDataSetChanged();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
 //                    mHandler.postDelayed(new Runnable() {
 //                        @Override
 //                        public void run() {

app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonDataFormActivity.java

@@ -1291,7 +1291,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                                     }
                                     param.put("page", "1");
                                     param.put("condition", "1=1");
-                                    param.put("pageSize", "30");
+                                    param.put("pageSize", "1000");
                                     param.put("field", data.getField());
                                     Bundle bundle = new Bundle();
                                     bundle.putSerializable("param", param);

app_modular/appworks/src/main/java/com/uas/appworks/activity/WorkDataFormActivity.java

@@ -1288,7 +1288,7 @@ public class WorkDataFormActivity extends BaseActivity implements View.OnClickLi
                                     }
                                     param.put("page", "1");
                                     param.put("condition", "1=1");
-                                    param.put("pageSize", "30");
+                                    param.put("pageSize", "1000");
                                     param.put("field", data.getField());
                                     Bundle bundle = new Bundle();
                                     bundle.putSerializable("param", param);

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/ContactDynamicAddActivity.java

@@ -1263,7 +1263,7 @@ public class ContactDynamicAddActivity extends BaseActivity implements View.OnCl
                                 param.put("page", "1");
                                 param.put("which", "form");
                                 param.put("condition", "1=1");
-                                param.put("pageSize", "30");
+                                param.put("pageSize", "1000");
                                 param.put("field", data.getField());
                                 Bundle bundle = new Bundle();
                                 bundle.putSerializable("param", param);
@@ -1274,6 +1274,7 @@ public class ContactDynamicAddActivity extends BaseActivity implements View.OnCl
                                 } else {
                                     intent.putExtra("isSingle", false);
                                 }
+                                currentGroupId = data.getGroupId();
 
                                 intent.putExtra("reid", R.style.OAThemeMeet);
                                 intent.putExtras(bundle);
@@ -1314,7 +1315,7 @@ public class ContactDynamicAddActivity extends BaseActivity implements View.OnCl
                                     }
                                     param.put("page", "1");
                                     param.put("condition", "1=1");
-                                    param.put("pageSize", "30");
+                                    param.put("pageSize", "1000");
                                     param.put("field", data.getField());
                                     Bundle bundle = new Bundle();
                                     bundle.putSerializable("param", param);
@@ -1602,8 +1603,12 @@ public class ContactDynamicAddActivity extends BaseActivity implements View.OnCl
                         }
                     }
                     LogUtil.d(str.toString());
-//                    Toast.makeText(ct, "下拉项：" + datas.get(id - 1).getName() + "返回值：" + str.toString(), Toast.LENGTH_LONG).show();
-                    mAdapter.notifyDataSetChanged();
+                    try {
+                        mAdapter.getmListData().get(currentGroupId).getDatas().get(id - 1).setValue(str.toString());
+                        mAdapter.notifyDataSetChanged();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
                 break;
             case 0x25: