diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 9dbf009..af28c5f 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -6487,13 +6487,14 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type," + query.prepare("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type," " GROUP_CONCAT(bett.measure_param SEPARATOR ';') AS measure_params FROM biz_equipment_info bei" " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id" " LEFT JOIN biz_equipment_technical_target bett ON bett.equipment_no = bei.equipment_no" " WHERE beser.standard_id = :standardId" " GROUP BY bei.id "); query.bindValue(":standardId",standardId); + bool isSuccess = query.exec(); if (isSuccess) { while (query.next()) { BizDevice device; @@ -7017,41 +7018,41 @@ // return result; //} //【查询】核查项-二等铂电阻温度计 -QMap>> BaseCommonApi::getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList) -{ - QMap>> DataMapList; - QList resultData; - QStringList result; - resultData.clear(); - QSqlQuery query; - query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_resistance_thermometer " - " WHERE equipment_id = :equipment_id"); - query.bindValue(":equipment_id", equipment_id); - if (query.exec()) { - while (query.next()) { - result.clear(); - result.append(query.value("id").toString()); - result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) - result.append(query.value("equipment_id").toString());//配套设备id - result.append(query.value("params").toString());//核查项目(直接存字典value) - result.append(query.value("check_point").toString());//温度点/水三相点/确认点 - result.append(query.value("unit").toString());//单位(直接存字典value) - result.append(query.value("cycle_number").toString());//循环次数 - result.append(query.value("urel").toString());//Urel - result.append(query.value("check_type").toString());//核查类型(直接存字典value) - result.append(query.value("allow_value").toString());//允许值 - result.append(query.value("maximum_error").toString());//最大允许误差/最大允许误差绝对值 - result.append(query.value("remark").toString());//核查项备注 - result.append(query.value("create_time").toString()); - result.append(query.value("update_time").toString()); - resultData.append(result); - } - }else { - qDebug()<>> BaseCommonApi::getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList) +//{ +// QMap>> DataMapList; +// QList resultData; +// QStringList result; +// resultData.clear(); +// QSqlQuery query; +// query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_resistance_thermometer " +// " WHERE equipment_id = :equipment_id"); +// query.bindValue(":equipment_id", equipment_id); +// if (query.exec()) { +// while (query.next()) { +// result.clear(); +// result.append(query.value("id").toString()); +// result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) +// result.append(query.value("equipment_id").toString());//配套设备id +// result.append(query.value("params").toString());//核查项目(直接存字典value) +// result.append(query.value("check_point").toString());//温度点/水三相点/确认点 +// result.append(query.value("unit").toString());//单位(直接存字典value) +// result.append(query.value("cycle_number").toString());//循环次数 +// result.append(query.value("urel").toString());//Urel +// result.append(query.value("check_type").toString());//核查类型(直接存字典value) +// result.append(query.value("allow_value").toString());//允许值 +// result.append(query.value("maximum_error").toString());//最大允许误差/最大允许误差绝对值 +// result.append(query.value("remark").toString());//核查项备注 +// result.append(query.value("create_time").toString()); +// result.append(query.value("update_time").toString()); +// resultData.append(result); +// } +// }else { +// qDebug()<>> BaseCommonApi::GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList) //{ // QMap>> result; @@ -7072,30 +7073,41 @@ // //添加列头 // QStringList head; // head <<"序号"<<"核查项目"<<"温度点"<<"单位"<<"核查标准示值1"<<"测量标准示值1"<<"差值1"<<"核查标准示值2"<<"测量标准示值2" -// <<"差值2"<<"测量标准示值3"<<"测量标准示值3"<<"差值3"<<"测量标准示值4"<<"测量标准示值4"<<"差值4" -// <<"测量标准示值5"<<"测量标准示值5"<<"差值5"<<"测量标准示值6"<<"测量标准示值6"<<"差值6" +// <<"差值2"<<"核查标准示值3"<<"测量标准示值3"<<"差值3"<<"核查标准示值4"<<"测量标准示值4"<<"差值4" +// <<"核查标准示值5"<<"测量标准示值5"<<"差值5"<<"核查标准示值6"<<"测量标准示值6"<<"差值6" // <<"平均值(差值)"<<"重复性S(x)" ; -// headerMap.insert(row[8],head); +// headerMap.insert("重复性",head); // headList->insert(row[3],headerMap); // //添加数据 // QStringList Data; // Data.append(row[0]); //ID -// Data.append(VerificationItem); //检定项目 -// Data.append(row[9]);//核查点 -// Data.append(row[3]);//核查类型 +// Data.append(VerificationItem); //核查项目 +// Data.append(row[9]);//温度点 +// Data.append(row[3]);//单位 // Data.append(row[4]);//核查点类型 -// Data.append(row[10] + row[7]);//单位(频率) -// Data.append("");// -// Data.append("");// -// Data.append("");// -// Data.append("");// -// Data.append("");// -// Data.append("");// -// Data.append("");//算数平均值 -// Data.append("");//标准偏差S(X) -// Data.append("");//相对重复性 -// DCVList.append(Data); -// resultMap.insert("重复性",DCVList); +// Data.append(row[10] + row[7]);//核查标准示值1 +// Data.append("");//测量标准示值1 +// Data.append("");//差值1 +// Data.append("");//核查标准示值2 +// Data.append("");//测量标准示值2 +// Data.append("");//差值2 +// Data.append("");//测量标准示值3 +// Data.append("");//测量标准示值3 +// Data.append("");//差值3 +// Data.append("");//核查标准示值4 +// Data.append("");//测量标准示值4 +// Data.append("");//差值4 +// Data.append("");//核查标准示值5 +// Data.append("");//测量标准示值5 +// Data.append("");//差值5 +// Data.append("");//核查标准示值6 +// Data.append("");//测量标准示值6 +// Data.append("");//差值6 +// Data.append("");//平均值(差值) +// Data.append("");//重复性S(x) +// TemperatureList.append(Data); +// resultMap.insert("重复性",TemperatureList); + //// resultMap.insert() // }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("重复性")) { // VerificationItem = row[5];