diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index e953cb5..be399a9 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3302,35 +3302,29 @@ } + //测试界面 外观及功能性检查和检定数据头 -DeviceMeasureCalibratorPistonGauge BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemCatoryName,QString itemId) +DeviceMeasureCalibratorPistonGauge BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(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.prepare("SELECT bbdmii.appearance_function_check,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.insulation_resistance,bbdmicp.zero_drift,bbdmicp.range_unit,bbdmicp.measure_medium " + " ,bbdmicp.division FROM biz_business_device_measure_item_data_piston_gauge bbdmidpg " + " JOIN biz_business_device_measure_item_config_piston_gauge bbdmicp ON bbdmicp.item_id = bbdmidpg.item_id " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidpg.item_id" + " WHERE bbdmidpg.item_id = :itemId LIMIT 1"); + // 将参数绑定到占位符 1763116518209597442 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()); + result.insulation_resistance= query.value("insulation_resistance").toString();//绝缘电阻 + result.pointer_deflection_stability = query.value("pointer_deflection_stability").toString();//指针偏转平稳性 + result.zero_drift = query.value("zero_drift").toString();//零位飘移 + result.measure_medium = query.value("measure_medium").toString();//检定介质(字典value) + result.division = query.value("division").toString();//分度值的五分之一 } } else { qDebug() << "Query execution failed: " << query.lastError().text(); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index e953cb5..be399a9 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3302,35 +3302,29 @@ } + //测试界面 外观及功能性检查和检定数据头 -DeviceMeasureCalibratorPistonGauge BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemCatoryName,QString itemId) +DeviceMeasureCalibratorPistonGauge BaseCommonApi::getDeviceMeasureCalibratorPistonGaugeBystatus(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.prepare("SELECT bbdmii.appearance_function_check,bbdmicp.appearance,bbdmicp.tightness,bbdmicp.insulation_resistance,bbdmicp.zero_drift,bbdmicp.range_unit,bbdmicp.measure_medium " + " ,bbdmicp.division FROM biz_business_device_measure_item_data_piston_gauge bbdmidpg " + " JOIN biz_business_device_measure_item_config_piston_gauge bbdmicp ON bbdmicp.item_id = bbdmidpg.item_id " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidpg.item_id" + " WHERE bbdmidpg.item_id = :itemId LIMIT 1"); + // 将参数绑定到占位符 1763116518209597442 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()); + result.insulation_resistance= query.value("insulation_resistance").toString();//绝缘电阻 + result.pointer_deflection_stability = query.value("pointer_deflection_stability").toString();//指针偏转平稳性 + result.zero_drift = query.value("zero_drift").toString();//零位飘移 + result.measure_medium = query.value("measure_medium").toString();//检定介质(字典value) + result.division = query.value("division").toString();//分度值的五分之一 } } else { qDebug() << "Query execution failed: " << query.lastError().text(); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index fc97712..c72d477 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -678,6 +678,8 @@ QString appearance; QString tightness; QString pointer_deflection_stability; + QString insulation_resistance; + QString zero_drift; }; @@ -1426,7 +1428,7 @@ //【结果保存】压力 static bool InsertDeviceMeasureDataPistonGauge(DeviceMeasureDataPistonGauge gauge); //测试页面 压力 外观及功能性检查和检定数据头 - static DeviceMeasureCalibratorPistonGauge getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemCatoryName,QString itemId); + static DeviceMeasureCalibratorPistonGauge getDeviceMeasureCalibratorPistonGaugeBystatus(QString itemId); // 【查询】检定项直流稳压电源 static QMap> getDeviceMeasureItemDataDcPower(QString itemCatoryName,QString itemId,QMap *headList); static QMap> GetDataReturnItemListByDcPower(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList);