数据查询行数等于2

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/activity/DataInquiryListActivity.java

@@ -158,10 +158,10 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                                             } else if ("D".equals(type) || "CD".equals(type)) {
                                                 for (int m = 0; m < 2; m++) {
                                                     SchemeConditionBean.Property property = new SchemeConditionBean.Property();
-                                                    if (m == 0){
+                                                    if (m == 0) {
                                                         property.setDisplay(getMonthFirstDay());
                                                         property.setValue(getMonthFirstDay());
-                                                    }else if (m == 1){
+                                                    } else if (m == 1) {
                                                         property.setDisplay(getMonthLastDay());
                                                         property.setValue(getMonthLastDay());
                                                     }
@@ -639,70 +639,78 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                 }
                 break;
             case R.id.data_inquiry_list_option_confirm_tv:
-                mCondition = "";
-                for (int i = 0; i < mAppSchemeConditions.size(); i++) {
-                    SchemeConditionBean schemeConditionBean = mAppSchemeConditions.get(i);
-                    if ("N".equals(schemeConditionBean.getType()) && schemeConditionBean.getProperties().size() == 2) {
-                        if (!TextUtils.isEmpty(schemeConditionBean.getProperties().get(0).getDisplay())
-                                && !TextUtils.isEmpty(schemeConditionBean.getProperties().get(1).getDisplay())) {
-                            mCondition = mCondition + "(" + schemeConditionBean.getField()
-                                    + " >= " + schemeConditionBean.getProperties().get(0).getDisplay()
-                                    + " and " + schemeConditionBean.getField()
-                                    + " <= " + schemeConditionBean.getProperties().get(1).getDisplay() + ") and ";
-
-                        } else if (!TextUtils.isEmpty(schemeConditionBean.getProperties().get(0).getDisplay())) {
-                            mCondition = mCondition + "(" + schemeConditionBean.getField()
-                                    + " >= " + schemeConditionBean.getProperties().get(0).getDisplay() + ") and ";
-                        } else if (!TextUtils.isEmpty(schemeConditionBean.getProperties().get(1).getDisplay())) {
-                            mCondition = mCondition + "(" + schemeConditionBean.getField()
-                                    + " <= " + schemeConditionBean.getProperties().get(1).getDisplay() + ") and ";
-                        }
+                if (!CommonUtil.isNetWorkConnected(this)) {
+                    ToastMessage(getString(R.string.networks_out));
+                } else {
+                    exactQuery();
+                }
+                break;
+        }
+    }
 
-                    } else if (("D".equals(schemeConditionBean.getType()) || "CD".equals(schemeConditionBean.getType())) && schemeConditionBean.getProperties().size() == 2) {
-                        mCondition = mCondition + "(" + schemeConditionBean.getField()
-                                + " >= to_date(\'" + schemeConditionBean.getProperties().get(0).getDisplay()
-                                + "\',\'yyyy-MM-dd\') and " + schemeConditionBean.getField()
-                                + " <= to_date(\'" + schemeConditionBean.getProperties().get(1).getDisplay()
-                                + "\',\'yyyy-MM-dd\')) and ";
-                    } else if ("CBG".equals(schemeConditionBean.getType()) || "C".equals(schemeConditionBean.getType())
-                            || "R".equals(schemeConditionBean.getType()) || "EC".equals(schemeConditionBean.getType())) {
-                        String gridCondition = "";
-                        int selectedCount = 0;
-                        for (int j = 0; j < schemeConditionBean.getProperties().size(); j++) {
-                            if (schemeConditionBean.getProperties().get(j).isState()) {
-                                selectedCount++;
-                                gridCondition = gridCondition + schemeConditionBean.getField() + " = \'"
-                                        + schemeConditionBean.getProperties().get(j).getValue() + "\' or ";
-                            }
-                        }
-                        if (selectedCount > 0) {
-                            gridCondition = gridCondition.substring(0, gridCondition.length() - 4);
+    private void exactQuery() {
+        mCondition = "";
+        for (int i = 0; i < mAppSchemeConditions.size(); i++) {
+            SchemeConditionBean schemeConditionBean = mAppSchemeConditions.get(i);
+            if ("N".equals(schemeConditionBean.getType()) && schemeConditionBean.getProperties().size() == 2) {
+                if (!TextUtils.isEmpty(schemeConditionBean.getProperties().get(0).getDisplay())
+                        && !TextUtils.isEmpty(schemeConditionBean.getProperties().get(1).getDisplay())) {
+                    mCondition = mCondition + "(" + schemeConditionBean.getField()
+                            + " >= " + schemeConditionBean.getProperties().get(0).getDisplay()
+                            + " and " + schemeConditionBean.getField()
+                            + " <= " + schemeConditionBean.getProperties().get(1).getDisplay() + ") and ";
+
+                } else if (!TextUtils.isEmpty(schemeConditionBean.getProperties().get(0).getDisplay())) {
+                    mCondition = mCondition + "(" + schemeConditionBean.getField()
+                            + " >= " + schemeConditionBean.getProperties().get(0).getDisplay() + ") and ";
+                } else if (!TextUtils.isEmpty(schemeConditionBean.getProperties().get(1).getDisplay())) {
+                    mCondition = mCondition + "(" + schemeConditionBean.getField()
+                            + " <= " + schemeConditionBean.getProperties().get(1).getDisplay() + ") and ";
+                }
 
-                            mCondition = mCondition + "(" + gridCondition + ") and ";
-                        }
-                    } else {
-                        if (schemeConditionBean.getProperties().size() == 1) {
-                            if (!TextUtils.isEmpty(schemeConditionBean.getProperties().get(0).getDisplay())) {
-                                mCondition = mCondition + "(" + schemeConditionBean.getField()
-                                        + " = \'" + schemeConditionBean.getProperties().get(0).getDisplay() + "\')"
-                                        + " and ";
-                            }
-                        }
+            } else if (("D".equals(schemeConditionBean.getType()) || "CD".equals(schemeConditionBean.getType())) && schemeConditionBean.getProperties().size() == 2) {
+                mCondition = mCondition + "(" + schemeConditionBean.getField()
+                        + " >= to_date(\'" + schemeConditionBean.getProperties().get(0).getDisplay()
+                        + "\',\'yyyy-MM-dd\') and " + schemeConditionBean.getField()
+                        + " <= to_date(\'" + schemeConditionBean.getProperties().get(1).getDisplay()
+                        + "\',\'yyyy-MM-dd\')) and ";
+            } else if ("CBG".equals(schemeConditionBean.getType()) || "C".equals(schemeConditionBean.getType())
+                    || "R".equals(schemeConditionBean.getType()) || "EC".equals(schemeConditionBean.getType())) {
+                String gridCondition = "";
+                int selectedCount = 0;
+                for (int j = 0; j < schemeConditionBean.getProperties().size(); j++) {
+                    if (schemeConditionBean.getProperties().get(j).isState()) {
+                        selectedCount++;
+                        gridCondition = gridCondition + schemeConditionBean.getField() + " = \'"
+                                + schemeConditionBean.getProperties().get(j).getValue() + "\' or ";
                     }
                 }
+                if (selectedCount > 0) {
+                    gridCondition = gridCondition.substring(0, gridCondition.length() - 4);
 
-                if (mCondition.length() >= 5) {
-                    mCondition = mCondition.substring(0, mCondition.length() - 5);
+                    mCondition = mCondition + "(" + gridCondition + ") and ";
                 }
+            } else {
+                if (schemeConditionBean.getProperties().size() == 1) {
+                    if (!TextUtils.isEmpty(schemeConditionBean.getProperties().get(0).getDisplay())) {
+                        mCondition = mCondition + "(" + schemeConditionBean.getField()
+                                + " = \'" + schemeConditionBean.getProperties().get(0).getDisplay() + "\')"
+                                + " and ";
+                    }
+                }
+            }
+        }
 
-                Log.d("exactCondition", mCondition);
-
-                mPageIndex = 1;
-                mExactWholeLl.setVisibility(View.GONE);
-                progressDialog.show();
-                getSchemeData();
-                break;
+        if (mCondition.length() >= 5) {
+            mCondition = mCondition.substring(0, mCondition.length() - 5);
         }
+
+        Log.d("exactCondition", mCondition);
+
+        mPageIndex = 1;
+        mExactWholeLl.setVisibility(View.GONE);
+        progressDialog.show();
+        getSchemeData();
     }
 
     private void getVoice() {
@@ -732,30 +740,35 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         if (actionId == EditorInfo.IME_ACTION_SEARCH
                 || actionId == EditorInfo.IME_ACTION_SEND
                 || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-            String searchField = mSearchEditText.getText().toString().trim();
-            if (!TextUtils.isEmpty(searchField)) {
-                mCondition = "";
-                for (int i = 0; i < mfuzzySchemeConditionBeans.size(); i++) {
-                    mCondition = mCondition + "(" + mfuzzySchemeConditionBeans.get(i).getField()
-                            + " like \'%" + searchField + "%\') or ";
-                }
-                if (mCondition.length() >= 4) {
-                    mCondition = mCondition.substring(0, mCondition.length() - 4);
-                    mCondition = "(" + mCondition + ")";
-                }
+            if (!CommonUtil.isNetWorkConnected(this)) {
+                ToastMessage(getString(R.string.networks_out));
+            } else {
+                String searchField = mSearchEditText.getText().toString().trim();
+                if (!TextUtils.isEmpty(searchField)) {
+                    mCondition = "";
+                    for (int i = 0; i < mfuzzySchemeConditionBeans.size(); i++) {
+                        mCondition = mCondition + "(" + mfuzzySchemeConditionBeans.get(i).getField()
+                                + " like \'%" + searchField + "%\') or ";
+                    }
+                    if (mCondition.length() >= 4) {
+                        mCondition = mCondition.substring(0, mCondition.length() - 4);
+                        mCondition = "(" + mCondition + ")";
+                    }
 
-                Log.d("fuzzyCondition", mCondition);
+                    Log.d("fuzzyCondition", mCondition);
 
-            } else {
-                mCondition = "1 = 1";
+                } else {
+                    mCondition = "1 = 1";
+                }
+                mPageIndex = 1;
+                mSearchField = searchField;
+                mSearchEditText.clearFocus();
+                mFuzzyWholeLl.setVisibility(View.GONE);
+                mHistoryDataLv.setEnabled(false);
+                progressDialog.show();
+                getSchemeData();
             }
-            mPageIndex = 1;
-            mSearchField = searchField;
-            mSearchEditText.clearFocus();
-            mFuzzyWholeLl.setVisibility(View.GONE);
-            mHistoryDataLv.setEnabled(false);
-            progressDialog.show();
-            getSchemeData();
+
             return true;
         }
         return false;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/adapter/DataInquiryFlexAdapter.java

@@ -70,7 +70,7 @@ public class DataInquiryFlexAdapter extends BaseAdapter {
         DataInquiryFlexChildAdapter dataInquiryFlexChildAdapter = new DataInquiryFlexChildAdapter(context, rowBeans);
 
         holder.itemDataInquiryFlexLv.setAdapter(dataInquiryFlexChildAdapter);
-        if (rowBeans.size() < 2) {
+        if (object.getRowBeans().size() <= 2 || rowBeans.size() < 2) {
             holder.itemDataInquiryFlexIv.setVisibility(View.INVISIBLE);
         } else {
             holder.itemDataInquiryFlexIv.setVisibility(View.VISIBLE);