diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index beb4982..c37028d 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -736,13 +736,11 @@ QList BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) + QList CliTable=BaseCommonApi::getJudgeCalibrationTable(DeiverId); + if(CliTable.count()==0)return DataList; + switch (CliTable[0].belong_standard_equipment.toInt()) { case 1: //多功能校准源 - - DataList = BaseCommonApi::getVerificationMultiCalResultData(dataId,HeadList); break; } @@ -884,7 +882,7 @@ return result; } -//检定数据管理-检定基本信息 +//检定数据管理-检定基本信息 参数item_id 首页单条数据中包含 VerificationBasicDataDetails BaseCommonApi::getVerificationBasicDataDetails(QString item_id) { VerificationBasicDataDetails result; @@ -972,7 +970,7 @@ " JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id " " JOIN biz_equipment_info beit ON besci.equipment_id = beit.id " " LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id "); - if (isSuccess) { + if (isSuccess) { while (query.next()) { CheckData dataManage; dataManage.id = query.value("id").toString();