diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 5021c6d..beb4982 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -816,7 +816,7 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_id, bbdmii.item_category_name, " + bool isSuccess = query.exec("SELECT bbdmi.*, eei.id,bboi.customer_name, eemi.help_instruction, bbdmii.item_category_id, bbdmii.item_category_name, " " bbdmii.belong_standard_equipment, bboi.customer_address,_user.NAME,eei.meter_identify,dept.FULL_NAME" " FROM biz_business_device_measure_info bbdmi " " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id " @@ -832,6 +832,7 @@ while (query.next()) { VerificationData verificationData; verificationData.id = query.value("id").toString(); + verificationData.sample_id = query.value("sample_id").toString(); verificationData.sample_name = query.value("sample_name").toString(); verificationData.model = query.value("model").toString(); verificationData.help_instruction = query.value("help_instruction").toString(); @@ -979,7 +980,7 @@ dataManage.equipmentModel = query.value("equipmentModel").toString(); dataManage.manufacture_no = query.value("manufacture_no").toString(); // dataManage.meter_standard_name = query.value("meter_standard_name").toString(); -// dataManage.meter_standard_id = query.value("meter_standard_id").toString(); + dataManage.equipment_id = query.value("equipment_id").toString(); dataManage.create_user_name = query.value("create_user_name").toString(); dataManage.check_date = query.value("check_date").toDate(); dataManage.dept_name = query.value("dept_name").toString(); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 5021c6d..beb4982 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -816,7 +816,7 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_id, bbdmii.item_category_name, " + bool isSuccess = query.exec("SELECT bbdmi.*, eei.id,bboi.customer_name, eemi.help_instruction, bbdmii.item_category_id, bbdmii.item_category_name, " " bbdmii.belong_standard_equipment, bboi.customer_address,_user.NAME,eei.meter_identify,dept.FULL_NAME" " FROM biz_business_device_measure_info bbdmi " " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id " @@ -832,6 +832,7 @@ while (query.next()) { VerificationData verificationData; verificationData.id = query.value("id").toString(); + verificationData.sample_id = query.value("sample_id").toString(); verificationData.sample_name = query.value("sample_name").toString(); verificationData.model = query.value("model").toString(); verificationData.help_instruction = query.value("help_instruction").toString(); @@ -979,7 +980,7 @@ dataManage.equipmentModel = query.value("equipmentModel").toString(); dataManage.manufacture_no = query.value("manufacture_no").toString(); // dataManage.meter_standard_name = query.value("meter_standard_name").toString(); -// dataManage.meter_standard_id = query.value("meter_standard_id").toString(); + dataManage.equipment_id = query.value("equipment_id").toString(); dataManage.create_user_name = query.value("create_user_name").toString(); dataManage.check_date = query.value("check_date").toDate(); dataManage.dept_name = query.value("dept_name").toString(); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index a8a8755..7e8d9a3 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -299,6 +299,7 @@ public: QString id; QString sample_name;//设备名称 +QString sample_id;//被检设备id QString model;//型号规格 QString help_instruction;//辅助字段 QString manufacture_no;//出厂编号 @@ -381,6 +382,7 @@ public: QString id; QString equipmentName;//设备名称 + QString equipment_id;//设备id QString equipmentModel;//型号规格 QString manufacture_no;//出厂编号 QString meter_standard_name;//核查件