diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 45d7624..5021c6d 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -717,9 +717,9 @@ return DataList; } -<<<<<<< .mine//核查设备对应的装置表 核查项及核查点 传参设备id -=======//查找设备对应的装置表 传参设备id 核查项目及核查点 ->>>>>>> .theirsQList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) + +//核查设备对应的装置表 核查项及核查点 传参设备id +QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) { QList DataList; JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); @@ -733,7 +733,7 @@ return DataList; } //判断检定数据管理 结果信息表 -QList Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) +QList BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { QList DataList; JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); @@ -742,13 +742,14 @@ { case 1: //多功能校准源 -<<<<<<< .mine DataList = BaseCommonApi::getVerificationMultiCalResultData(dataId,HeadList); + + DataList = BaseCommonApi::getVerificationMultiCalResultData(dataId,HeadList); break; } return DataList; } //判断核查数据管理 结果信息表 -QList Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) +QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { QList DataList; JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); @@ -763,9 +764,7 @@ return DataList; } - - -=======>>>>>>> .theirs//被检设备管理-检定项目及检定点-多功能校准源 +//被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { QList resultData; @@ -1022,7 +1021,7 @@ } //核查数据管理-核查基本信息-基本信息 -CheckDataManageBasicInfo getCheckDataManageBasicInfo(QString equipment_id) +CheckDataManageBasicInfo BaseCommonApi::getCheckDataManageBasicInfo(QString equipment_id) { CheckDataManageBasicInfo result; QSqlQuery query; @@ -1050,56 +1049,57 @@ //核查数据管理-核查结果信息-核查项多功能校准源数据 参数首页数据的id -QList BaseCommonApi::getCheckDataManageResultManageMult(QString data_id,QStringList *HeadList) +QList BaseCommonApi::getCheckDataManageResultManageMult(QString data_id,QStringList *HeadList) { -QList result; +QList resultDate; +QStringList result; QSqlQuery query; query.prepare("SELECT * FROM biz_equipment_standard_check_data_calibrator WHERE data_id = :data_id "); query.bindValue(":data_id", data_id); if (query.exec()) { while (query.next()) { - StandCheckDataCalibrator dataCalibrator; - dataCalibrator.id = query.value("id").toString(); - dataCalibrator.data_id = query.value("data_id").toString(); - dataCalibrator.check_type = query.value("check_type").toString(); - dataCalibrator.test_type = query.value("test_type").toString(); - dataCalibrator.params = query.value("params").toString(); - dataCalibrator.unit = query.value("unit").toString(); - dataCalibrator.frequency = query.value("frequency").toString(); - dataCalibrator.frequency_unit = query.value("frequency_unit").toString(); - dataCalibrator.check_point = query.value("check_point").toString(); + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("data_id").toString()); + result.append(query.value("check_type").toString()); + result.append(query.value("test_type").toString()); + result.append(query.value("params").toString()); + result.append(query.value("unit").toString()); + result.append(query.value("frequency").toString()); + result.append(query.value("frequency_unit").toString()); + result.append(query.value("check_point").toString()); - dataCalibrator.test_value_one_date = query.value("test_value_one_date").toDate(); - dataCalibrator.test_value_one = query.value("test_value_one").toString(); + result.append(query.value("test_value_one_date").toString()); + result.append(query.value("test_value_one").toString()); - dataCalibrator.test_value_two_date = query.value("test_value_two_date").toDate(); - dataCalibrator.test_value_two = query.value("test_value_two").toString(); + result.append(query.value("test_value_two_date").toString()); + result.append(query.value("test_value_two").toString()); - dataCalibrator.test_value_three_date = query.value("test_value_three_date").toDate(); - dataCalibrator.test_value_three = query.value("test_value_three").toString(); + result.append( query.value("test_value_three_date").toString()); + result.append(query.value("test_value_three").toString()); - dataCalibrator.test_value_four_date = query.value("test_value_four_date").toDate(); - dataCalibrator.test_value_four = query.value("test_value_four").toString(); + result.append(query.value("test_value_four_date").toString()); + result.append(query.value("test_value_four").toString()); - dataCalibrator.test_value_five_date = query.value("test_value_five_date").toDate(); - dataCalibrator.test_value_five = query.value("test_value_five").toString(); + result.append(query.value("test_value_five_date").toString()); + result.append(query.value("test_value_five").toString()); - dataCalibrator.test_value_six_date = query.value("test_value_six_date").toDate(); - dataCalibrator.test_value_six = query.value("test_value_six").toString(); + result.append( query.value("test_value_six_date").toString()); + result.append( query.value("test_value_six").toString()); - dataCalibrator.average_value = query.value("average_value").toString(); - dataCalibrator.standard_deviation = query.value("standard_deviation").toString(); - dataCalibrator.relative_repeatability = query.value("relative_repeatability").toString(); - dataCalibrator.urel = query.value("urel").toString(); - dataCalibrator.less_than = query.value("less_than").toString(); - dataCalibrator.qualified = query.value("qualified").toString(); + result.append(query.value("average_value").toString()); + result.append( query.value("standard_deviation").toString()); + result.append( query.value("relative_repeatability").toString()); + result.append( query.value("urel").toString()); + result.append(query.value("less_than").toString()); + result.append( query.value("qualified").toString()); - dataCalibrator.create_time = query.value("create_time").toDateTime(); - dataCalibrator.update_time = query.value("update_time").toDateTime(); + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); - result.append(dataCalibrator); + resultDate.append(result); } } else { qDebug() << "Query execution failed: " << query.lastError().text(); @@ -1109,7 +1109,7 @@ <<"核查读数3日期（稳定性） "<<"核查读数3（示值）"<<"核查读数4日期（稳定性）"<<"核查读数4（示值）"<<"核查读数5日期（稳定性）" <<"核查读数5（示值）"<<"核查读数6日期（稳定性）"<<"核查读数6（本次示值）"<<"核查读数平均值(算数平均值)"<<"Sn(x)(标准偏差)" <<"Sn(x)/核查读数平均值(相对重复性)"<<"UREL"<<"是否小于相对扩展不确定度Urel(0/1)"<<"稳定性考核是否合格"<<"创建时间"<<"更新时间"; - return result; + return resultDate; } //技术文件管理