数据查询建表类移动

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

@@ -157,16 +157,21 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         mHistoricalRecordAdapter = new HistoricalRecordAdapter(DataInquiryListActivity.this, mHistoricalRecordBeans);
         mHistoryDataLv.setAdapter(mHistoricalRecordAdapter);
 
-        List<HistoricalRecordBean> historicalRecordBeansById = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(mSchemeId);
-        if (historicalRecordBeansById.size() > 0) {
-            for (int i = 0; i < historicalRecordBeansById.size(); i++) {
-                if (i < 6) {
-                    mHistoricalRecordBeans.add(historicalRecordBeansById.get(i));
+        try {
+            List<HistoricalRecordBean> historicalRecordBeansById = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(mSchemeId);
+            if (historicalRecordBeansById.size() > 0) {
+                for (int i = 0; i < historicalRecordBeansById.size(); i++) {
+                    if (i < 6) {
+                        mHistoricalRecordBeans.add(historicalRecordBeansById.get(i));
+                    }
                 }
+                mHistoricalRecordAdapter.notifyDataSetChanged();
             }
-            mHistoricalRecordAdapter.notifyDataSetChanged();
+        }catch (Exception e){
+
         }
 
+
         if (!CommonUtil.isNetWorkConnected(this)) {
             mEmptyLayout.setErrorMessage(getString(R.string.networks_out));
             mEmptyLayout.showError();
@@ -462,15 +467,19 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                         historicalRecordBean.setSearchField(mSearchField);
                         HistoricalRecordDao.getInstance().saveToHistoricalRecord(historicalRecordBean);
 
-                        mHistoricalRecordBeans.clear();
-                        List<HistoricalRecordBean> historicalRecordBeansById = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(mSchemeId);
-                        if (historicalRecordBeansById.size() > 0) {
-                            for (int i = 0; i < historicalRecordBeansById.size(); i++) {
-                                if (i < 6) {
-                                    mHistoricalRecordBeans.add(historicalRecordBeansById.get(i));
+                        try {
+                            mHistoricalRecordBeans.clear();
+                            List<HistoricalRecordBean> historicalRecordBeansById = HistoricalRecordDao.getInstance().getHistoricalRecordBeansById(mSchemeId);
+                            if (historicalRecordBeansById.size() > 0) {
+                                for (int i = 0; i < historicalRecordBeansById.size(); i++) {
+                                    if (i < 6) {
+                                        mHistoricalRecordBeans.add(historicalRecordBeansById.get(i));
+                                    }
                                 }
+                                mHistoricalRecordAdapter.notifyDataSetChanged();
                             }
-                            mHistoricalRecordAdapter.notifyDataSetChanged();
+                        }catch (Exception e){
+
                         }
                     }
 

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

@@ -3,6 +3,8 @@ package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.database;
 import android.database.Cursor;
 import android.database.CursorWrapper;
 
+import com.core.db.DatabaseTables;
+
 /**
  * Created by RaoMeng on 2017/8/18.
  * 历史记录的CursorWrapper封装类
@@ -20,9 +22,9 @@ public class HistoricalRecordCursorWrapper extends CursorWrapper {
 
     public HistoricalRecordBean getHistoricalRecord() {
         int id = getInt(getColumnIndex("_id"));
-        String schemeId = getString(getColumnIndex(HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_ID));
-        String schemeName = getString(getColumnIndex(HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_NAME));
-        String searchField = getString(getColumnIndex(HistoricalRecordSchema.HistoricalRecordTable.Cols.SEARCH_FIELD));
+        String schemeId = getString(getColumnIndex(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID));
+        String schemeName = getString(getColumnIndex(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_NAME));
+        String searchField = getString(getColumnIndex(DatabaseTables.HistoricalRecordTable.Cols.SEARCH_FIELD));
 
         HistoricalRecordBean historicalRecordBean = new HistoricalRecordBean();
         historicalRecordBean.setId(id);

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

@@ -5,6 +5,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
 import com.core.db.DatabaseManager;
+import com.core.db.DatabaseTables;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,9 +40,9 @@ public class HistoricalRecordDao {
     private ContentValues getContentValues(HistoricalRecordBean historicalRecordBean) {
         ContentValues values = new ContentValues();
 
-        values.put(HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_ID, historicalRecordBean.getSchemeId());
-        values.put(HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_NAME, historicalRecordBean.getSchemeName());
-        values.put(HistoricalRecordSchema.HistoricalRecordTable.Cols.SEARCH_FIELD, historicalRecordBean.getSearchField());
+        values.put(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID, historicalRecordBean.getSchemeId());
+        values.put(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_NAME, historicalRecordBean.getSchemeName());
+        values.put(DatabaseTables.HistoricalRecordTable.Cols.SEARCH_FIELD, historicalRecordBean.getSearchField());
 
         return values;
     }
@@ -53,7 +54,7 @@ public class HistoricalRecordDao {
      * @return
      */
     public List<HistoricalRecordBean> getHistoricalRecordBeansById(String schemeId) {
-        HistoricalRecordCursorWrapper cursor = queryHistoricalRecord(HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
+        HistoricalRecordCursorWrapper cursor = queryHistoricalRecord(DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
                 new String[]{schemeId});
 
         List<HistoricalRecordBean> historicalRecordBeans = new ArrayList<>();
@@ -78,7 +79,7 @@ public class HistoricalRecordDao {
         deleteFromHistoricalRecordByField(historicalRecordBean.getSchemeId(), historicalRecordBean.getSearchField());
 
         ContentValues values = getContentValues(historicalRecordBean);
-        sqLiteDatabase.insert(HistoricalRecordSchema.HistoricalRecordTable.NAME, null, values);
+        sqLiteDatabase.insert(DatabaseTables.HistoricalRecordTable.NAME, null, values);
 
         DatabaseManager.getInstance().closeDatabase();
     }
@@ -86,8 +87,8 @@ public class HistoricalRecordDao {
     public void deleteFromHistoricalRecordById(String schemeId) {
         SQLiteDatabase sqLiteDatabase = DatabaseManager.getInstance().openDatabase();
 
-        sqLiteDatabase.delete(HistoricalRecordSchema.HistoricalRecordTable.NAME,
-                HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
+        sqLiteDatabase.delete(DatabaseTables.HistoricalRecordTable.NAME,
+                DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
                 new String[]{schemeId});
 
         DatabaseManager.getInstance().closeDatabase();
@@ -96,9 +97,9 @@ public class HistoricalRecordDao {
     public void deleteFromHistoricalRecordByField(String schemeId, String searchField) {
         SQLiteDatabase sqLiteDatabase = DatabaseManager.getInstance().openDatabase();
 
-        sqLiteDatabase.delete(HistoricalRecordSchema.HistoricalRecordTable.NAME,
-                HistoricalRecordSchema.HistoricalRecordTable.Cols.SEARCH_FIELD + " = ? and "
-                        + HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
+        sqLiteDatabase.delete(DatabaseTables.HistoricalRecordTable.NAME,
+                DatabaseTables.HistoricalRecordTable.Cols.SEARCH_FIELD + " = ? and "
+                        + DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
                 new String[]{searchField, schemeId});
 
         DatabaseManager.getInstance().closeDatabase();
@@ -108,8 +109,8 @@ public class HistoricalRecordDao {
         SQLiteDatabase sqLiteDatabase = DatabaseManager.getInstance().openDatabase();
 
         ContentValues values = getContentValues(historicalRecordBean);
-        sqLiteDatabase.update(HistoricalRecordSchema.HistoricalRecordTable.NAME, values,
-                HistoricalRecordSchema.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
+        sqLiteDatabase.update(DatabaseTables.HistoricalRecordTable.NAME, values,
+                DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + " = ?",
                 new String[]{historicalRecordBean.getSchemeId()});
 
         DatabaseManager.getInstance().closeDatabase();
@@ -125,7 +126,7 @@ public class HistoricalRecordDao {
     public HistoricalRecordCursorWrapper queryHistoricalRecord(String whereCause, String[] whereArgs) {
         SQLiteDatabase sqLiteDatabase = DatabaseManager.getInstance().openDatabase();
 
-        Cursor cursor = sqLiteDatabase.query(HistoricalRecordSchema.HistoricalRecordTable.NAME, null,
+        Cursor cursor = sqLiteDatabase.query(DatabaseTables.HistoricalRecordTable.NAME, null,
                 whereCause,
                 whereArgs,
                 null, null, "_id DESC");

app_core/common/src/main/java/com/core/app/Constants.java

@@ -1,5 +1,7 @@
 package com.core.app;
 
+import com.core.db.DatabaseTables;
+
 /**
  * Created by Administrator on 2016/1/30.
  */
@@ -261,6 +263,14 @@ public class Constants {
             + "recorddate varchar(50)"//录入时间yyyy-MM-dd HH:mm:ss
             + ")";
 
+    //数据查询历史记录表
+    public static final String TABLE_HISTORICAL_RECORD = "create table "
+            + DatabaseTables.HistoricalRecordTable.NAME + "("
+            + "_id integer primary key autoincrement, "
+            + DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + ", "
+            + DatabaseTables.HistoricalRecordTable.Cols.SCHEME_NAME + ", "
+            + DatabaseTables.HistoricalRecordTable.Cols.SEARCH_FIELD + ")";
+
 
     /**
      * @desc:常量

app_core/common/src/main/java/com/core/db/DBOpenHelper.java

@@ -13,8 +13,8 @@ import com.core.app.Constants;
  * @注释:建立数据库
  */
 public class DBOpenHelper extends SQLiteOpenHelper {
-    //TODO  上一个发布版本是79
-    private static final int DATABASE_VERSION = 81;
+    //TODO  上一个发布版本是81
+    private static final int DATABASE_VERSION = 83;
     public static String dataBaseName = "erp.db";
     public Context context;
 
@@ -54,6 +54,8 @@ public class DBOpenHelper extends SQLiteOpenHelper {
             db.execSQL(Constants.EM_ERPNEWS);//
             db.execSQL(Constants.CREATE_BANNER);//
             db.execSQL(Constants.AUTO_LOG);   //监控日志表
+
+            db.execSQL(Constants.TABLE_HISTORICAL_RECORD);//数据查询历史记录表
         } catch (Exception e) {
 
         }
@@ -94,6 +96,7 @@ public class DBOpenHelper extends SQLiteOpenHelper {
         db.execSQL("DROP TABLE IF EXISTS step");
         db.execSQL("DROP TABLE IF EXISTS SignAutoLog");
         db.execSQL("DROP TABLE IF EXISTS tbl_contacts");
+        db.execSQL("DROP TABLE IF EXISTS " + DatabaseTables.HistoricalRecordTable.NAME);
     }
 
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/database/HistoricalRecordSchema.java → app_core/common/src/main/java/com/core/db/DatabaseTables.java

@@ -1,10 +1,10 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.database;
+package com.core.db;
 
 /**
  * Created by RaoMeng on 2017/8/14.
- * 数据查询历史记录表
+ * 数据库表
  */
-public class HistoricalRecordSchema {
+public class DatabaseTables {
     public static final class HistoricalRecordTable {
         public static final String NAME = "historical_record";