diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 27d8249..4c17e56 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3128,7 +3128,7 @@ CheckProgramManage result; QSqlQuery query; query.prepare("SELECT id,check_name,belong_standard_equipment_name,category_name,create_name,create_time,remark,img_path," - " standard_device_id,verification_documents_id FROM zd_verification_program_manage " + " standard_device_id,verification_documents_id,belong_standard_equipment,equipment_type FROM zd_verification_program_manage " "WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { @@ -3144,6 +3144,8 @@ programInfo.img_path = query.value("img_path").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.verification_documents_id = query.value("verification_documents_id").toString(); + programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.equipment_type = query.value("equipment_type").toString(); // programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 27d8249..4c17e56 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3128,7 +3128,7 @@ CheckProgramManage result; QSqlQuery query; query.prepare("SELECT id,check_name,belong_standard_equipment_name,category_name,create_name,create_time,remark,img_path," - " standard_device_id,verification_documents_id FROM zd_verification_program_manage " + " standard_device_id,verification_documents_id,belong_standard_equipment,equipment_type FROM zd_verification_program_manage " "WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { @@ -3144,6 +3144,8 @@ programInfo.img_path = query.value("img_path").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.verification_documents_id = query.value("verification_documents_id").toString(); + programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.equipment_type = query.value("equipment_type").toString(); // programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 5039b47..54db9ad 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -159,8 +159,13 @@ QTableWidgetItem* p_check = new QTableWidgetItem(); p_check->setCheckState(Qt::Unchecked); //设置首列为 CheckBox 控件 ui->tableWidgetStd->setItem(0,0,p_check); - ui->tableWidgetStd->setItem(0, 1, new QTableWidgetItem(programInfo.biz_standard_id.split(",")[i]));//所属装置名称ID - ui->tableWidgetStd->setItem(0, 2, new QTableWidgetItem(programInfo.biz_standard_name.split(",")[i]));//所属装置名称 + if(programInfo.biz_standard_id == "" || programInfo.biz_standard_name==""){ + ui->tableWidgetStd->setItem(0, 1, new QTableWidgetItem(""));//所属装置名称ID + ui->tableWidgetStd->setItem(0, 2, new QTableWidgetItem(""));//所属装置名称 + }else { + ui->tableWidgetStd->setItem(0, 1, new QTableWidgetItem(programInfo.biz_standard_id.split(",")[i]));//所属装置名称ID + ui->tableWidgetStd->setItem(0, 2, new QTableWidgetItem(programInfo.biz_standard_name.split(",")[i]));//所属装置名称 + } ui->tableWidgetStd->setItem(0, 3, new QTableWidgetItem(item.equipment_name)); ui->tableWidgetStd->setItem(0, 4, new QTableWidgetItem(item.model)); //设置数据 ui->tableWidgetStd->setItem(0, 5, new QTableWidgetItem(item.manufacture_no)); @@ -303,17 +308,21 @@ break; } }*/ - for(int i=0;itableWidgetStd->rowCount();i++){ - Qt::CheckState state = ui->tableWidgetStd->item(i,0)->checkState(); - if(state == Qt::Checked){ - StandarIdList.append(catIdList[i]); - StanDeviceIDList.append(ui->tableWidgetStd->item(i,1)->text()); - StanDeviceNameList.append(ui->tableWidgetStd->item(i,2)->text()); - } - } + if(catIdList.count()==1) { StandarIdList.append(catIdList[0]); + StanDeviceIDList.append(ui->tableWidgetStd->item(0,1)->text()); + StanDeviceNameList.append(ui->tableWidgetStd->item(0,2)->text()); + }else { + for(int i=0;itableWidgetStd->rowCount();i++){ + Qt::CheckState state = ui->tableWidgetStd->item(i,0)->checkState(); + if(state == Qt::Checked){ + StandarIdList.append(catIdList[i]); + StanDeviceIDList.append(ui->tableWidgetStd->item(i,1)->text()); + StanDeviceNameList.append(ui->tableWidgetStd->item(i,2)->text()); + } + } } if(StandarIdList.count()==0){