diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index e55c059..931a7c1 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -737,12 +737,34 @@ return result; } - -//检定程序管理-查询 -QList BaseCommonApi::getVerificationProgramInfo(QString id) +//检定程序管理首页查询 +QList getVerificationProgramInfoMain() { QList result; QSqlQuery query; + bool isSuccess = query.exec("SELECT id,program_name ,create_name ,create_time ,remark FROM zd_verification_program_info"); + if (isSuccess) { + while (query.next()) { + VerificationProgramInfo programInfo; + programInfo.id = query.value("id").toString(); + programInfo.program_name = query.value("program_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; + +} + +//检定程序管理-编辑 查询 +VerificationProgramInfo BaseCommonApi::getVerificationProgramInfo(QString id) +{ + 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 " @@ -769,7 +791,7 @@ programInfo.manufacture_no = query.value("manufacture_no").toString(); programInfo.manufacturer = query.value("manufacturer").toString(); - result.append(programInfo); + result = programInfo; } } else { qDebug() << "Query execution failed: " << query.lastError().text(); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index e55c059..931a7c1 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -737,12 +737,34 @@ return result; } - -//检定程序管理-查询 -QList BaseCommonApi::getVerificationProgramInfo(QString id) +//检定程序管理首页查询 +QList getVerificationProgramInfoMain() { QList result; QSqlQuery query; + bool isSuccess = query.exec("SELECT id,program_name ,create_name ,create_time ,remark FROM zd_verification_program_info"); + if (isSuccess) { + while (query.next()) { + VerificationProgramInfo programInfo; + programInfo.id = query.value("id").toString(); + programInfo.program_name = query.value("program_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; + +} + +//检定程序管理-编辑 查询 +VerificationProgramInfo BaseCommonApi::getVerificationProgramInfo(QString id) +{ + 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 " @@ -769,7 +791,7 @@ programInfo.manufacture_no = query.value("manufacture_no").toString(); programInfo.manufacturer = query.value("manufacturer").toString(); - result.append(programInfo); + result = programInfo; } } else { qDebug() << "Query execution failed: " << query.lastError().text(); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index cccbbc6..49cf892 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -494,8 +494,10 @@ static QList getCheckDataManageResultManageMult(QString equipment_id); //技术文件 static QList getTechnique_File(); - //检定程序管理 - static QList getVerificationProgramInfo(QString id); + //检定程序管理首页查询 + static QList getVerificationProgramInfoMain(); + //检定程序管理 编辑 + static VerificationProgramInfo getVerificationProgramInfo(QString id); //查询设备通信接口 static QList getVerificationProgramConfigInterface(QString deviceId); //新建检定程序 @@ -521,6 +523,8 @@ qint64 generateId(); //雪花算法生成id IdWorker &idWorker = Singleton::instance(); + //自动检定 + };