报表统计condition加默认条件

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

@@ -340,7 +340,11 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
         Intent intent = new Intent();
         intent.setClass(this, PDFDownloadActivity.class);
         if (mCondition.length() != 0) {
-            intent.putExtra("condition", mCondition);
+            if (!TextUtils.isEmpty(mDefaultCondition)) {
+                intent.putExtra("condition", mCondition + " and " + mDefaultCondition);
+            } else {
+                intent.putExtra("condition", mCondition);
+            }
         } else if (!TextUtils.isEmpty(mDefaultCondition)) {
             intent.putExtra("condition", mDefaultCondition);
         } else {