diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 0cb1812..dc0806b 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3260,14 +3260,41 @@ } - - - - - //测试界面 外观及功能性检查和检定数据头 -//QMap>> ; - +DeviceMeasureCalibratorPistonGauge BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemCatoryName,QString itemId) +{ + DeviceMeasureCalibratorPistonGauge result; + QSqlQuery query; + query.prepare("SELECT bbdmidpg.*,bbdmii.appearance_function_check,bbdmicp.indication_error,bbdmicp.measure_medium, " + " bbdmicp.division,bbdmicp.deviation_and_switching,bbdmicp.display_value_one,bbdmicp.display_value_two,bbdmicp.display_value_three, " + " bbdmicp.insulation_resistance,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.pointer_deflection_stability," + "bbdmidpg.create_time,bbdmidpg.update_time " + " FROM biz_business_device_measure_item_data_piston_gauge bbdmidpg " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidpg.item_id " + " JOIN biz_business_device_measure_item_config_piston_gauge bbdmicp ON bbdmicp.item_id = bbdmidpg.item_id " + " WHERE bbdmidpg.item_id = :itemId ORDER BY bbdmidpg.update_time DESC"); + // 将参数绑定到占位符 + query.bindValue(":itemId", itemId); + if (query.exec()) { + while (query.next()) { + result.id = query.value("id").toString(); + result.item_id = query.value("item_id").toString(); //检定项目ID +// result.append(query.value("accuracy_class").toString());//准确度等级 + result.appearance_function_check = query.value("appearance_function_check").toString();//外观及功能性检查(1/0) +// result.append(query.value("indication_error").toString());//示值误差、回程误差、轻敲位移 + result.measure_medium = query.value("measure_medium").toString();//检定介质(字典value) + result.division = query.value("division").toString();//分度值的五分之一 + result.appearance = query.value("appearance").toString();//外观 + result.tightness= query.value("tightness").toString();//密封性 + result.pointer_deflection_stability=query.value("pointer_deflection_stability").toString();//指针偏转平稳性 +// result.append(query.value("create_time").toString()); +// result.append(query.value("update_time").toString()); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} //自动检定数据结果保存 参数1：装置字典1,2,3 参数2:BaseClass父类， 子类赋值 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 0cb1812..dc0806b 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3260,14 +3260,41 @@ } - - - - - //测试界面 外观及功能性检查和检定数据头 -//QMap>> ; - +DeviceMeasureCalibratorPistonGauge BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemCatoryName,QString itemId) +{ + DeviceMeasureCalibratorPistonGauge result; + QSqlQuery query; + query.prepare("SELECT bbdmidpg.*,bbdmii.appearance_function_check,bbdmicp.indication_error,bbdmicp.measure_medium, " + " bbdmicp.division,bbdmicp.deviation_and_switching,bbdmicp.display_value_one,bbdmicp.display_value_two,bbdmicp.display_value_three, " + " bbdmicp.insulation_resistance,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.pointer_deflection_stability," + "bbdmidpg.create_time,bbdmidpg.update_time " + " FROM biz_business_device_measure_item_data_piston_gauge bbdmidpg " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidpg.item_id " + " JOIN biz_business_device_measure_item_config_piston_gauge bbdmicp ON bbdmicp.item_id = bbdmidpg.item_id " + " WHERE bbdmidpg.item_id = :itemId ORDER BY bbdmidpg.update_time DESC"); + // 将参数绑定到占位符 + query.bindValue(":itemId", itemId); + if (query.exec()) { + while (query.next()) { + result.id = query.value("id").toString(); + result.item_id = query.value("item_id").toString(); //检定项目ID +// result.append(query.value("accuracy_class").toString());//准确度等级 + result.appearance_function_check = query.value("appearance_function_check").toString();//外观及功能性检查(1/0) +// result.append(query.value("indication_error").toString());//示值误差、回程误差、轻敲位移 + result.measure_medium = query.value("measure_medium").toString();//检定介质(字典value) + result.division = query.value("division").toString();//分度值的五分之一 + result.appearance = query.value("appearance").toString();//外观 + result.tightness= query.value("tightness").toString();//密封性 + result.pointer_deflection_stability=query.value("pointer_deflection_stability").toString();//指针偏转平稳性 +// result.append(query.value("create_time").toString()); +// result.append(query.value("update_time").toString()); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} //自动检定数据结果保存 参数1：装置字典1,2,3 参数2:BaseClass父类， 子类赋值 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 28195e5..81c85f2 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -673,6 +673,11 @@ QString theoretical_output_value_unit;//理论输出值单位 QDateTime create_time; QDateTime update_time; + QString appearance_function_check; + QString division; + QString appearance; + QString tightness; + QString pointer_deflection_stability; }; @@ -1367,7 +1372,8 @@ static QMap> GetDataReturnItemListByPistonGaugeResult(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); //【结果保存】压力 static bool InsertDeviceMeasureDataPistonGauge(DeviceMeasureDataPistonGauge gauge); - + //测试页面 压力 外观及功能性检查和检定数据头 + static DeviceMeasureCalibratorPistonGauge getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemCatoryName,QString itemId); // 【查询】直流稳压电源 static QMap> getDeviceMeasureItemDataDcPower(QString itemCatoryName,QString itemId,QMap *headList); static QMap> GetDataReturnItemListByDcPower(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList);