diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 7d1524a..d3d341b 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -923,14 +923,8 @@ { VerificationProgramInfo result; QSqlQuery query; - query.prepare("SELECT zvpi.id,zvpi.program_name ,zvpi.create_name ,zvpi.create_time ,zvpi.remark ,zvpi.img_path ,zvpi.tested_device_id ,zvpi.standard_device_id ,eei.equipment_name ,eei.model ,eei.help_instruction ,eei.manufacture_no ,eei.manufacturer " - " FROM zd_verification_program_info zvpi " - " LEFT JOIN eqpt_equipment_info eei ON eei.id = zvpi.tested_device_id WHERE zvpi.id = :id " - "UNION ALL " - " SELECT zvpi.id,zvpi.program_name ,zvpi.create_name ,zvpi.create_time ,zvpi.remark ,zvpi.img_path,zvpi.tested_device_id ,zvpi.standard_device_id ,bei.equipment_name ,bei.model ,NULL ,bei.manufacture_no ,bei.manufacturer " - " FROM zd_verification_program_info zvpi " - " LEFT JOIN biz_equipment_info bei ON bei.id = zvpi.standard_device_id " - " WHERE zvpi.id = :id "); + query.prepare("SELECT id,program_name,create_name,create_time,remark,img_path,tested_device_id," + "standard_device_id,update_time FROM zd_verification_program_info WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { @@ -943,12 +937,7 @@ programInfo.img_path = query.value("img_path").toString(); programInfo.tested_device_id = query.value("tested_device_id").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); - programInfo.equipment_name = query.value("equipment_name").toString(); - programInfo.model = query.value("model").toString(); - programInfo.help_instruction = query.value("help_instruction").toString(); - programInfo.manufacture_no = query.value("manufacture_no").toString(); - programInfo.manufacturer = query.value("manufacturer").toString(); - + programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } } else { @@ -1240,3 +1229,30 @@ } return isSuccess; } + // 核查程序管理首页查询 +QList BaseCommonApi::getCheckProgramManage() +{ + QList result; + QSqlQuery query; + bool isSuccess = query.exec("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time " + "FROM zd_verification_program_manage"); + if (isSuccess) { + while (query.next()) { + CheckProgramManage programInfo; + programInfo.id = query.value("id").toString(); + programInfo.check_name = query.value("check_name").toString(); + programInfo.create_name = query.value("create_name").toString(); + programInfo.create_time = query.value("create_time").toDateTime(); + programInfo.remark = query.value("remark").toString(); + result.append(programInfo); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//核查程序管理-编辑查询单个 +CheckProgramManage BaseCommonApi::getCheckProgramManageById(QString id) +{ + +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 7d1524a..d3d341b 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -923,14 +923,8 @@ { VerificationProgramInfo result; QSqlQuery query; - query.prepare("SELECT zvpi.id,zvpi.program_name ,zvpi.create_name ,zvpi.create_time ,zvpi.remark ,zvpi.img_path ,zvpi.tested_device_id ,zvpi.standard_device_id ,eei.equipment_name ,eei.model ,eei.help_instruction ,eei.manufacture_no ,eei.manufacturer " - " FROM zd_verification_program_info zvpi " - " LEFT JOIN eqpt_equipment_info eei ON eei.id = zvpi.tested_device_id WHERE zvpi.id = :id " - "UNION ALL " - " SELECT zvpi.id,zvpi.program_name ,zvpi.create_name ,zvpi.create_time ,zvpi.remark ,zvpi.img_path,zvpi.tested_device_id ,zvpi.standard_device_id ,bei.equipment_name ,bei.model ,NULL ,bei.manufacture_no ,bei.manufacturer " - " FROM zd_verification_program_info zvpi " - " LEFT JOIN biz_equipment_info bei ON bei.id = zvpi.standard_device_id " - " WHERE zvpi.id = :id "); + query.prepare("SELECT id,program_name,create_name,create_time,remark,img_path,tested_device_id," + "standard_device_id,update_time FROM zd_verification_program_info WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { @@ -943,12 +937,7 @@ programInfo.img_path = query.value("img_path").toString(); programInfo.tested_device_id = query.value("tested_device_id").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); - programInfo.equipment_name = query.value("equipment_name").toString(); - programInfo.model = query.value("model").toString(); - programInfo.help_instruction = query.value("help_instruction").toString(); - programInfo.manufacture_no = query.value("manufacture_no").toString(); - programInfo.manufacturer = query.value("manufacturer").toString(); - + programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } } else { @@ -1240,3 +1229,30 @@ } return isSuccess; } + // 核查程序管理首页查询 +QList BaseCommonApi::getCheckProgramManage() +{ + QList result; + QSqlQuery query; + bool isSuccess = query.exec("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time " + "FROM zd_verification_program_manage"); + if (isSuccess) { + while (query.next()) { + CheckProgramManage programInfo; + programInfo.id = query.value("id").toString(); + programInfo.check_name = query.value("check_name").toString(); + programInfo.create_name = query.value("create_name").toString(); + programInfo.create_time = query.value("create_time").toDateTime(); + programInfo.remark = query.value("remark").toString(); + result.append(programInfo); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//核查程序管理-编辑查询单个 +CheckProgramManage BaseCommonApi::getCheckProgramManageById(QString id) +{ + +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 7a15793..39dbeeb 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -386,12 +386,8 @@ QString img_path; //连接图片地址 QString tested_device_id; //被检设备id QString standard_device_id; //标准设备id -// ------------- - QString equipment_name;//设备名称 - QString model; //型号规格 - QString help_instruction; //辅助字段 - QString manufacture_no; //出厂编号 - QString manufacturer; //生产厂家 + QDateTime update_time;//更新时间 + }; @@ -468,6 +464,26 @@ QString remark;//输出备注 }; +//----------------------------------------------------- +//核查程序管理 +class CheckProgramManage +{ +public: + QString id;//id + QString check_name;//核查程序名称 + QString create_name;//创建人 + QDateTime create_time;//创建时间 + QString remark; //说明 + QString img_path;//图片路径 + QString standard_device_id;//标准设备id + QString verification_documents_id;//核查件设备id + QDateTime update_time;//更新时间 +}; + + + + + using namespace Jiawa::Core; class BaseCommonApi @@ -564,7 +580,10 @@ static bool InsertSaveDeviceMeasureInfo(SaveDeviceMeasureInfo saveInfo); //自动检定-结果保存-更新检定结果信息-多功能校准源检定装置 只更新 示值和绝对误差 static bool UpdateVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); - + // 核查程序管理首页查询 + static QList getCheckProgramManage(); + //核查程序管理-编辑查询单个 + static CheckProgramManage getCheckProgramManageById(QString id); };