|
|
@@ -341,7 +341,7 @@ bool NodeMatrixService::QueryNodeMatrixListByExpertIdAndEngineerId(QList<NodeMat
|
|
|
QSqlQuery query(db);
|
|
|
bool ret = false;
|
|
|
QString selectSql = QString("select id,expert_name, engineer_id, node, abscissa, ordinate, "
|
|
|
- "node_value, expert_id,mind_id,write_date,str_uuid from "
|
|
|
+ "node_value, expert_id,mind_id,write_date,mark,str_uuid from "
|
|
|
"t_node_matrix_info where expert_id "
|
|
|
"= '%1' and engineer_id ='%2' and table_msg ='%3'")
|
|
|
.arg(QString::number(expertId))
|
|
|
@@ -354,8 +354,8 @@ bool NodeMatrixService::QueryNodeMatrixListByExpertIdAndEngineerId(QList<NodeMat
|
|
|
NodeMatrixInfo *nodeMatrixInfo = new NodeMatrixInfo();
|
|
|
nodeMatrixInfo->id = query.value(0).toInt();
|
|
|
nodeMatrixInfo->expertName = query.value(1).toString();
|
|
|
- nodeMatrixInfo->node = query.value(2).toString();
|
|
|
nodeMatrixInfo->engineerId = query.value(3).toInt();
|
|
|
+ nodeMatrixInfo->node = query.value(2).toString();
|
|
|
nodeMatrixInfo->abscissa = query.value(4).toString();
|
|
|
nodeMatrixInfo->ordinate = query.value(5).toString();
|
|
|
nodeMatrixInfo->nodeValue = query.value(6).toString();
|
|
|
@@ -381,7 +381,7 @@ bool NodeMatrixService::QueryNodeMatrixListByExpertIdAndEngineerId2(QList<NodeMa
|
|
|
QSqlQuery query(db);
|
|
|
bool ret = false;
|
|
|
QString selectSql = QString("select id,expert_name, engineer_id, node, abscissa, ordinate, "
|
|
|
- "node_value, expert_id,mind_id,write_date,str_uuid from "
|
|
|
+ "node_value, expert_id,mind_id,write_date,mark,str_uuid from "
|
|
|
"t_node_matrix_info where expert_id "
|
|
|
"= '%1' and engineer_id ='%2' and table_msg ='%3'")
|
|
|
.arg(QString::number(expertId))
|
|
|
@@ -394,16 +394,17 @@ bool NodeMatrixService::QueryNodeMatrixListByExpertIdAndEngineerId2(QList<NodeMa
|
|
|
NodeMatrixInfo *nodeMatrixInfo = new NodeMatrixInfo();
|
|
|
nodeMatrixInfo->id = query.value(0).toInt();
|
|
|
nodeMatrixInfo->expertName = query.value(1).toString();
|
|
|
- nodeMatrixInfo->node = query.value(2).toString();
|
|
|
nodeMatrixInfo->engineerId = query.value(3).toInt();
|
|
|
- nodeMatrixInfo->abscissa = query.value(4).toString();
|
|
|
- nodeMatrixInfo->ordinate = query.value(5).toString();
|
|
|
- nodeMatrixInfo->nodeValue = query.value(6).toString();
|
|
|
- nodeMatrixInfo->expertId = query.value(7).toInt();
|
|
|
- nodeMatrixInfo->mindId = query.value(8).toInt();
|
|
|
- nodeMatrixInfo->writeDate = query.value(9).toDateTime();
|
|
|
- nodeMatrixInfo->mark = query.value(10).toString();
|
|
|
- nodeMatrixInfo->strUuid = query.value(11).toString();
|
|
|
+
|
|
|
+ nodeMatrixInfo->node = query.value(2).toString();
|
|
|
+ nodeMatrixInfo->abscissa = query.value(4).toString();
|
|
|
+ nodeMatrixInfo->ordinate = query.value(5).toString();
|
|
|
+ nodeMatrixInfo->nodeValue = query.value(6).toString();
|
|
|
+ nodeMatrixInfo->expertId = query.value(7).toInt();
|
|
|
+ nodeMatrixInfo->mindId = query.value(8).toInt();
|
|
|
+ nodeMatrixInfo->writeDate = query.value(9).toDateTime();
|
|
|
+ nodeMatrixInfo->mark = query.value(10).toString();
|
|
|
+ nodeMatrixInfo->strUuid = query.value(11).toString();
|
|
|
nodeMatrixInfoList->append(nodeMatrixInfo);
|
|
|
}
|
|
|
ret = true;
|
