Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c+...

xuxiuxi

2019-03-08 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612

 QiaoJiaSystem/DataManagerServer/vss/dao/VssLocalSettingTblSqliteDao.h

@@ -73,9 +73,7 @@
        QMutexLocker mutexLocker(m_mutexVisit);//TODO

        QSqlTableModel pModel(NULL, *m_db);

        pModel.setTable(VSSLocalSettingTbl_Sqlite_TABLE_NAME);

        for (auto whereKeyValue : whereKeyValues ) {

            pModel.setFilter(QObject::tr((string(whereKeyValue.first)+" = '%1'").c_str()).arg(QString::fromUtf8(whereKeyValue.second.c_str())));

        }

        pModel.setFilter(QObject::tr(getWhereColumnNameValuePair(whereKeyValues).c_str()));

        pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange

        pModel.select();



@@ -112,9 +110,7 @@
        QMutexLocker mutexLocker(m_mutexVisit);//TODO

        QSqlTableModel pModel(NULL, *m_db);

        pModel.setTable(VSSLocalSettingTbl_Sqlite_TABLE_NAME);

        for (auto whereKeyValue : whereKeyValues) {

            pModel.setFilter(QObject::tr((whereKeyValue.first + " = '%1'").c_str()).arg(QString::fromStdString(whereKeyValue.second)));

        }

        pModel.setFilter(QObject::tr(getWhereColumnNameValuePair(whereKeyValues).c_str()));

        pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange

        pModel.select();



@@ -174,9 +170,7 @@
        std::list<Record_Cut_Video_info> lst;

        QSqlTableModel pModel(NULL, *m_db);

        pModel.setTable(VSSLocalSettingTbl_Sqlite_TABLE_NAME);;

        for (auto whereKeyValue : whereKeyValues ) {

            pModel.setFilter(QObject::tr((string(whereKeyValue.first)+" = '%1'").c_str()).arg(QString::fromUtf8(whereKeyValue.second.c_str())));

        }

        pModel.setFilter(QObject::tr(getWhereColumnNameValuePair(whereKeyValues).c_str()));

        pModel.setEditStrategy(QSqlTableModel::OnManualSubmit);//OnManualSubmit OnFieldChange

        pModel.select();