diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 5bb2196..52380da 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -260,9 +260,7 @@ - //获取创建任务 -任务单列表 - QListBaseCommonApi::getCatTaskList(QString orderId) { QList result; @@ -379,7 +377,7 @@ bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << " query failed: " << query.lastError().text(); } return isSuccess; @@ -408,7 +406,7 @@ bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << " query failed: " << query.lastError().text(); } return isSuccess; @@ -438,7 +436,7 @@ bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << "query failed: " << query.lastError().text(); } return isSuccess; @@ -1037,7 +1035,7 @@ " FROM biz_equipment_standard_check_info besci " " JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id " " JOIN biz_equipment_info beit ON besci.equipment_id = beit.id " - " LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id "); + " LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id ORDER BY besci.create_time DESC "); if (isSuccess) { while (query.next()) { CheckData dataManage; @@ -1700,11 +1698,11 @@ { QList resultData; QStringList result; - QSqlQuery query; - query.prepare("SELECT * " - " from biz_equipment_standard_check_item_data_calibrator bescidc WHERE bescidc.equipment_id = :equipment_id" - "from biz_equipment_standard_check_item_data_calibrator bescidc WHERE bescidc.equipment_id = '1692808528303013889' "); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " + "WHERE equipment_id = :equipment_id"); query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { while (query.next()) { result.clear(); @@ -2071,3 +2069,102 @@ } return result; } +//计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[新增] +bool BaseCommonApi::InsertModifyRecord(MeasureModifyRecord record) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_business_device_measure_modify_record " + " (id, data_id,source_system, modify_content, create_user_id, create_user_name, create_time,update_time ) " + " VALUES (:id, :data_id, :source_system, :modify_content, :create_user_id, :create_user_name, :create_time, :update_time )"); + QString formattedDateTime = record.create_time.toString("yyyy-MM-dd HH:mm:ss"); + // 绑定所有值 + query.bindValue(":id", record.id); + query.bindValue(":data_id", record.data_id); + query.bindValue(":source_system", record.source_system); + query.bindValue(":modify_content", record.modify_content); + query.bindValue(":create_user_id", record.create_user_id); + query.bindValue(":create_user_name", record.create_user_name); + query.bindValue(":create_time",formattedDateTime); + query.bindValue(":update_time", formattedDateTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "Insert query failed: " << query.lastError().text(); + } + + return isSuccess; +} +//计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[查询] 参数 检定数据管理基础信息表id +QList BaseCommonApi::getModifyRecord(QString data_id) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT * FROM biz_business_device_measure_modify_record WHERE data_id = :data_id "); + query.bindValue(":data_id",data_id); + if (query.exec()) { + while (query.next()) { + MeasureModifyRecord record; + record.id = query.value("id").toString(); + record.data_id = query.value("data_id").toString(); + record.source_system = query.value("source_system").toString(); + record.modify_content = query.value("modify_content").toString(); + record.create_user_id = query.value("create_user_id").toString(); + record.create_user_name = query.value("create_user_name").toString(); + record.create_time = query.value("create_time").toDateTime(); + record.update_time = query.value("update_time").toDateTime(); + result.append(record); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 +bool BaseCommonApi::InsertCheckModifyRecord(MeasureModifyRecord record) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_modify_record " + " (id, data_id,source_system, modify_content, create_user_id, create_user_name, create_time,update_time ) " + " VALUES (:id, :data_id, :source_system, :modify_content, :create_user_id, :create_user_name, :create_time, :update_time )"); + QString formattedDateTime = record.create_time.toString("yyyy-MM-dd HH:mm:ss"); + // 绑定所有值 + query.bindValue(":id", record.id); + query.bindValue(":data_id", record.data_id); + query.bindValue(":source_system", record.source_system); + query.bindValue(":modify_content", record.modify_content); + query.bindValue(":create_user_id", record.create_user_id); + query.bindValue(":create_user_name", record.create_user_name); + query.bindValue(":create_time",formattedDateTime); + query.bindValue(":update_time", formattedDateTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "Insert query failed: " << query.lastError().text(); + } + + return isSuccess; +} + +//设备与装置-标准装置管理-核查数据管理核查数据历史修改记录[查询] 参数 检定数据管理基础信息表id +QList getMeasureModifyRecord(QString data_id) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_modify_record WHERE data_id = :data_id "); + query.bindValue(":data_id",data_id); + if (query.exec()) { + while (query.next()) { + MeasureModifyRecord record; + record.id = query.value("id").toString(); + record.data_id = query.value("data_id").toString(); + record.source_system = query.value("source_system").toString(); + record.modify_content = query.value("modify_content").toString(); + record.create_user_id = query.value("create_user_id").toString(); + record.create_user_name = query.value("create_user_name").toString(); + record.create_time = query.value("create_time").toDateTime(); + record.update_time = query.value("update_time").toDateTime(); + result.append(record); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 5bb2196..52380da 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -260,9 +260,7 @@ - //获取创建任务 -任务单列表 - QListBaseCommonApi::getCatTaskList(QString orderId) { QList result; @@ -379,7 +377,7 @@ bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << " query failed: " << query.lastError().text(); } return isSuccess; @@ -408,7 +406,7 @@ bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << " query failed: " << query.lastError().text(); } return isSuccess; @@ -438,7 +436,7 @@ bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << "query failed: " << query.lastError().text(); } return isSuccess; @@ -1037,7 +1035,7 @@ " FROM biz_equipment_standard_check_info besci " " JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id " " JOIN biz_equipment_info beit ON besci.equipment_id = beit.id " - " LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id "); + " LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id ORDER BY besci.create_time DESC "); if (isSuccess) { while (query.next()) { CheckData dataManage; @@ -1700,11 +1698,11 @@ { QList resultData; QStringList result; - QSqlQuery query; - query.prepare("SELECT * " - " from biz_equipment_standard_check_item_data_calibrator bescidc WHERE bescidc.equipment_id = :equipment_id" - "from biz_equipment_standard_check_item_data_calibrator bescidc WHERE bescidc.equipment_id = '1692808528303013889' "); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " + "WHERE equipment_id = :equipment_id"); query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { while (query.next()) { result.clear(); @@ -2071,3 +2069,102 @@ } return result; } +//计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[新增] +bool BaseCommonApi::InsertModifyRecord(MeasureModifyRecord record) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_business_device_measure_modify_record " + " (id, data_id,source_system, modify_content, create_user_id, create_user_name, create_time,update_time ) " + " VALUES (:id, :data_id, :source_system, :modify_content, :create_user_id, :create_user_name, :create_time, :update_time )"); + QString formattedDateTime = record.create_time.toString("yyyy-MM-dd HH:mm:ss"); + // 绑定所有值 + query.bindValue(":id", record.id); + query.bindValue(":data_id", record.data_id); + query.bindValue(":source_system", record.source_system); + query.bindValue(":modify_content", record.modify_content); + query.bindValue(":create_user_id", record.create_user_id); + query.bindValue(":create_user_name", record.create_user_name); + query.bindValue(":create_time",formattedDateTime); + query.bindValue(":update_time", formattedDateTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "Insert query failed: " << query.lastError().text(); + } + + return isSuccess; +} +//计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[查询] 参数 检定数据管理基础信息表id +QList BaseCommonApi::getModifyRecord(QString data_id) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT * FROM biz_business_device_measure_modify_record WHERE data_id = :data_id "); + query.bindValue(":data_id",data_id); + if (query.exec()) { + while (query.next()) { + MeasureModifyRecord record; + record.id = query.value("id").toString(); + record.data_id = query.value("data_id").toString(); + record.source_system = query.value("source_system").toString(); + record.modify_content = query.value("modify_content").toString(); + record.create_user_id = query.value("create_user_id").toString(); + record.create_user_name = query.value("create_user_name").toString(); + record.create_time = query.value("create_time").toDateTime(); + record.update_time = query.value("update_time").toDateTime(); + result.append(record); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 +bool BaseCommonApi::InsertCheckModifyRecord(MeasureModifyRecord record) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_modify_record " + " (id, data_id,source_system, modify_content, create_user_id, create_user_name, create_time,update_time ) " + " VALUES (:id, :data_id, :source_system, :modify_content, :create_user_id, :create_user_name, :create_time, :update_time )"); + QString formattedDateTime = record.create_time.toString("yyyy-MM-dd HH:mm:ss"); + // 绑定所有值 + query.bindValue(":id", record.id); + query.bindValue(":data_id", record.data_id); + query.bindValue(":source_system", record.source_system); + query.bindValue(":modify_content", record.modify_content); + query.bindValue(":create_user_id", record.create_user_id); + query.bindValue(":create_user_name", record.create_user_name); + query.bindValue(":create_time",formattedDateTime); + query.bindValue(":update_time", formattedDateTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "Insert query failed: " << query.lastError().text(); + } + + return isSuccess; +} + +//设备与装置-标准装置管理-核查数据管理核查数据历史修改记录[查询] 参数 检定数据管理基础信息表id +QList getMeasureModifyRecord(QString data_id) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_modify_record WHERE data_id = :data_id "); + query.bindValue(":data_id",data_id); + if (query.exec()) { + while (query.next()) { + MeasureModifyRecord record; + record.id = query.value("id").toString(); + record.data_id = query.value("data_id").toString(); + record.source_system = query.value("source_system").toString(); + record.modify_content = query.value("modify_content").toString(); + record.create_user_id = query.value("create_user_id").toString(); + record.create_user_name = query.value("create_user_name").toString(); + record.create_time = query.value("create_time").toDateTime(); + record.update_time = query.value("update_time").toDateTime(); + result.append(record); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 8e1446f..6ff8519 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -797,6 +797,21 @@ QDateTime update_time; }; +//计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录 +class MeasureModifyRecord +{ +public: + QString id; + QString data_id;//检定数据管理基础信息表id + QString source_system;//计量业务管理系统/自动检定系统 + QString modify_content;//修改内容 + QString create_user_id;//创建用户id + QString create_user_name;//创建用户名 + QDateTime create_time;//创建时间 + QDateTime update_time;//更新时间 +}; +//设备与装置-标准装置管理-核查数据管理核查数据历史修改记录 与 MeasureModifyRecord 一致 复用 + @@ -929,7 +944,7 @@ static bool InsertSaveDeviceMeasureInfo(SaveDeviceMeasureInfo saveInfo); //自动检定-结果保存-数据关联-计量检定业务-受检设备检定管理-检定数据管理-所使用的标准、主要测量设备 static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); - //自动检定-结果保存-更新检定结果信息-多功能校准源检定装置 + //自动检定-结果保存-检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); // 核查程序管理首页查询 static QList getCheckProgramManage(); @@ -955,7 +970,7 @@ static bool InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge); //自动核查-结果保存-基本信息 static bool InsertCheckDataManageBasicInfo(CheckDataManageBasicInfo baseInfo); -// //查询实验室及温湿度 最新的1条,即上次 待修改 禁用 + //查询实验室及温湿度 最新的1条,即上次 待修改 禁用 static LocationInfo getLocationInfo(); //查询出所有实验室地点,用于自动检定/核查 结果保存 地点下拉框查询 static QList getLocationInfoList(); @@ -965,6 +980,14 @@ static QList SelectDeptData(QString UserId); //查询出所有委托方 static QList SelectCustomerData(); + //计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[新增] + static bool InsertModifyRecord(MeasureModifyRecord record); + //计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[查询] 参数 检定数据管理基础信息表id + static QList getModifyRecord(QString data_id); + //设备与装置-标准装置管理-核查数据管理核查数据历史修改记录[新增] 与 MeasureModifyRecord 一致 复用 + static bool InsertCheckModifyRecord(MeasureModifyRecord record); + //设备与装置-标准装置管理-核查数据管理核查数据历史修改记录[查询] 参数 检定数据管理基础信息表id + static QList getMeasureModifyRecord(QString data_id); };