查询统计需求修改备份

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

@@ -84,6 +84,7 @@ public class DataInquiryActivity extends BaseActivity {
             if (!CommonUtil.isNetWorkConnected(this)) {
                 ToastMessage(getString(R.string.networks_out));
             } else {
+                progressDialog.show();
                 getMenuData();
             }
         } else {
@@ -240,7 +241,6 @@ public class DataInquiryActivity extends BaseActivity {
 
 
     private void getMenuData() {
-        progressDialog.show();
         String url = CommonUtil.getAppBaseUrl(this) + "mobile/qry/queryJsp.action";
         Map<String, Object> params = new HashMap<>();
         params.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
@@ -262,6 +262,7 @@ public class DataInquiryActivity extends BaseActivity {
                         CommonUtil.setSharedPreferences(DataInquiryActivity.this,
                                 mCurrentUser + mCurrentMaster + com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.Constants.CONSTANT.DATA_INQUIRY_MENU_CACHE,
                                 result);
+                    mGridMenuDataInquiryBeans.clear();
                     analysisMenuData(result);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:

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

@@ -130,7 +130,7 @@ public class DataInquirySearchActivity extends BaseActivity {
 
                 Intent intent = new Intent();
                 intent.setClass(DataInquirySearchActivity.this, DataInquiryListActivity.class);
-                intent.putExtra("scheme", mDataInquirySearchBeanList.get(position).getQueryScheme());
+                intent.putExtra("scheme", mDataInquirySearchAdapter.getObjects().get(position).getQueryScheme());
                 startActivity(intent);
             }
         });

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

@@ -151,7 +151,7 @@ public class ReportQuerySearchActivity extends BaseActivity {
 
                 Intent intent = new Intent();
                 intent.setClass(ReportQuerySearchActivity.this, ReportQueryCriteriaActivity.class);
-                intent.putExtra("reportinfo", mQuerySearchBeanList.get(position).getListBean());
+                intent.putExtra("reportinfo", mReportQuerySearchAdapter.getObjects().get(position).getListBean());
                 startActivity(intent);
             }
         });

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

@@ -84,6 +84,7 @@ public class ReportStatisticsActivity extends BaseActivity {
             if (!CommonUtil.isNetWorkConnected(this)) {
                 ToastMessage(getString(R.string.networks_out));
             } else {
+                progressDialog.show();
                 getMenuData();
             }
         } else {
@@ -253,7 +254,6 @@ public class ReportStatisticsActivity extends BaseActivity {
 
 
     private void getMenuData() {
-        progressDialog.show();
         String url = CommonUtil.getAppBaseUrl(this) + "mobile/qry/getReport.action";
         Map<String, Object> params = new HashMap<>();
         params.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
@@ -275,6 +275,7 @@ public class ReportStatisticsActivity extends BaseActivity {
                         CommonUtil.setSharedPreferences(ReportStatisticsActivity.this,
                                 mCurrentUser + mCurrentMaster + com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.Constants.CONSTANT.REPORT_QUERY_MENU_CACHE,
                                 result);
+                    mGridMenuReportStatisticsBeans.clear();
                     analysisMenuData(result);
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION: