From 5f1a4dabd3c579775c1762f6ca76bcdb3b857b0a Mon Sep 17 00:00:00 2001 From: shijianquan <992593080@qq.com> Date: Mon, 29 Sep 2025 13:48:32 +0800 Subject: [PATCH] =?UTF-8?q?[M]=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=85=88=E6=8C=89=20=E7=AB=99id=20?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E5=86=8D=E6=8C=89rtu=5Fno?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/gui/plugin/TrendCurves/CTrendInfoManage.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp b/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp index 9df1aac9..0ce115b9 100644 --- a/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp +++ b/product/src/gui/plugin/TrendCurves/CTrendInfoManage.cpp @@ -334,10 +334,10 @@ void CTrendInfoManage::loadDevGroupInfo(CDbApi *pReadDb) QString sqlSequenceQuery = QStringLiteral("select tag_name, description, location_id from dev_group where sub_system > 3 "); if(!strLoctionFilter.isEmpty()) { - sqlSequenceQuery.append(QString(" and %1 order by dev_group_no asc;").arg(strLoctionFilter)); + sqlSequenceQuery.append(QString(" and %1 order by location_id , rtu_no , dev_group_no asc ,tag_name;").arg(strLoctionFilter)); }else { - sqlSequenceQuery.append(QStringLiteral(" order by dev_group_no asc;")); + sqlSequenceQuery.append(QStringLiteral(" order by location_id , rtu_no , dev_group_no asc ,tag_name;")); } query.setForwardOnly(true); pReadDb->execute(sqlSequenceQuery, query); @@ -368,11 +368,13 @@ void CTrendInfoManage::loadDeviceInfo(CDbApi *pReadDb) } strLoctionFilter = QString("(group_tag_name in ('%1'))").arg(listLocation.join("','")); } - QString sqlSequenceQuery = QStringLiteral("select tag_name, description, group_tag_name, location_id from dev_info"); + QString sqlSequenceQuery = QStringLiteral("select tag_name, description, group_tag_name, location_id from dev_info "); if(!strLoctionFilter.isEmpty()) { - sqlSequenceQuery.append(QString(" where %1;").arg(strLoctionFilter)); + sqlSequenceQuery.append(QString(" where %1").arg(strLoctionFilter)); } + sqlSequenceQuery.append(" order by location_id, tag_name;"); + query.setForwardOnly(true); pReadDb->execute(sqlSequenceQuery, query); while(query.next())