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/CamDevSqliteDao.h

@@ -80,9 +80,7 @@
        QMutexLocker mutexLocker(m_mutexVisit);//TODO
        QSqlTableModel pModel(NULL, *m_db);
        pModel.setTable(CamDev_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();

@@ -119,9 +117,7 @@
        QMutexLocker mutexLocker(m_mutexVisit);//TODO
        QSqlTableModel pModel(NULL, *m_db);
        pModel.setTable(CamDev_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();

@@ -181,9 +177,7 @@
        std::list<Record_Cut_Video_info> lst;
        QSqlTableModel pModel(NULL, *m_db);
        pModel.setTable(CamDev_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();