diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index b051bbe..70e97a8 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -687,8 +687,9 @@ QList result; QSqlQuery query; bool isSuccess = query.exec("SELECT bei.id , bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.meter_standard_name ,bei.meter_standard_id ," - " besci.create_user_name , besci.check_date , bei.dept_name " - " FROM biz_equipment_info bei LEFT JOIN biz_equipment_standard_check_info besci ON besci.equipment_id = bei.id"); + " besci.create_user_name , besci.check_date , bei.dept_name,blrd.biz_lab_code " + " FROM biz_equipment_info bei LEFT JOIN biz_equipment_standard_check_info besci ON besci.equipment_id = bei.id" + " LEFT JOIN biz_lab_rel_dept blrd ON blrd.dept_id = bei.dept_id"); if (isSuccess) { while (query.next()) { CheckData dataManage; @@ -930,13 +931,14 @@ bool BaseCommonApi::InsertVerificationProgramInfo(VerificationProgramInfo verInfo) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_info (id,program_name,create_name,create_time, remark,img_path,tested_device_id,standard_device_id)" - " VALUES (':id', ':program_name',':create_name', ':create_time', ':remark',':img_path',':tested_device_id',':standard_device_id');"); + query.prepare("INSERT INTO zd_verification_program_info (id, program_name, create_name, create_time, remark, img_path, tested_device_id, standard_device_id)" + " VALUES (:id, :program_name, :create_name, :create_time, :remark, :img_path, :tested_device_id, :standard_device_id);"); + QString formattedDateTime = verInfo.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", verInfo.id); query.bindValue(":program_name", verInfo.program_name); query.bindValue(":create_name", verInfo.create_name); - query.bindValue(":create_time", verInfo.create_time); + query.bindValue(":create_time", formattedDateTime); query.bindValue(":remark", verInfo.remark); query.bindValue(":img_path", verInfo.img_path); query.bindValue(":tested_device_id", verInfo.tested_device_id); @@ -956,14 +958,15 @@ QSqlQuery query; query.prepare("INSERT INTO zd_communication_setting (id,device_id,communication_type,serial_port,visa,create_time,update_time) " " VALUES (':id',':device_id',':communication_type',':serial_port',':visa',':create_time',':update_time')"); - + QString formattedDateTime = configInterdace.create_time.toString("yyyy-MM-dd HH:mm:ss"); + QString formattedUpdateDateTime = configInterdace.update_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", configInterdace.id); query.bindValue(":device_id", configInterdace.device_id); query.bindValue(":communication_type", configInterdace.communication_type); query.bindValue(":serial_port", configInterdace.serial_port); query.bindValue(":visa", configInterdace.visa); - query.bindValue(":create_time", configInterdace.create_time); - query.bindValue(":update_time", configInterdace.update_time); + query.bindValue(":create_time", formattedDateTime); + query.bindValue(":update_time", formattedUpdateDateTime); bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -1000,10 +1003,11 @@ query.prepare("UPDATE zd_communication_setting SET communication_type = :communication_type, " " serial_port = :serial_port,visa = :visa,update_time = :update_time " " WHERE device_id = :device_id;"); + QString formattedDateTime = configInterdace.update_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":communication_type", configInterdace.communication_type); query.bindValue(":serial_port", configInterdace.serial_port); query.bindValue(":visa", configInterdace.visa); - query.bindValue(":update_time", configInterdace.update_time); + query.bindValue(":update_time", formattedDateTime); query.bindValue(":device_id", configInterdace.device_id); bool isSuccess = query.exec(); if (!isSuccess) { @@ -1071,6 +1075,8 @@ "device_name = :device_name,instruct_config = :instruct_config,instruct_read = :instruct_read," " type = :type,belong_vername = :belong_vername,belong_checkname = :belong_checkname," "update_time = :update_time WHERE id = :id"); + + QString formattedUpdateDateTime = instructionLib.update_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":device_id", instructionLib.device_id); query.bindValue(":device_name", instructionLib.device_name); query.bindValue(":instruct_config", instructionLib.instruct_config); @@ -1078,7 +1084,7 @@ query.bindValue(":type", instructionLib.type); query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); - query.bindValue(":update_time", instructionLib.update_time); + query.bindValue(":update_time", formattedUpdateDateTime); query.bindValue(":id", instructionLib.id); bool isSuccess = query.exec(); if (!isSuccess) { diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index b051bbe..70e97a8 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -687,8 +687,9 @@ QList result; QSqlQuery query; bool isSuccess = query.exec("SELECT bei.id , bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.meter_standard_name ,bei.meter_standard_id ," - " besci.create_user_name , besci.check_date , bei.dept_name " - " FROM biz_equipment_info bei LEFT JOIN biz_equipment_standard_check_info besci ON besci.equipment_id = bei.id"); + " besci.create_user_name , besci.check_date , bei.dept_name,blrd.biz_lab_code " + " FROM biz_equipment_info bei LEFT JOIN biz_equipment_standard_check_info besci ON besci.equipment_id = bei.id" + " LEFT JOIN biz_lab_rel_dept blrd ON blrd.dept_id = bei.dept_id"); if (isSuccess) { while (query.next()) { CheckData dataManage; @@ -930,13 +931,14 @@ bool BaseCommonApi::InsertVerificationProgramInfo(VerificationProgramInfo verInfo) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_info (id,program_name,create_name,create_time, remark,img_path,tested_device_id,standard_device_id)" - " VALUES (':id', ':program_name',':create_name', ':create_time', ':remark',':img_path',':tested_device_id',':standard_device_id');"); + query.prepare("INSERT INTO zd_verification_program_info (id, program_name, create_name, create_time, remark, img_path, tested_device_id, standard_device_id)" + " VALUES (:id, :program_name, :create_name, :create_time, :remark, :img_path, :tested_device_id, :standard_device_id);"); + QString formattedDateTime = verInfo.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", verInfo.id); query.bindValue(":program_name", verInfo.program_name); query.bindValue(":create_name", verInfo.create_name); - query.bindValue(":create_time", verInfo.create_time); + query.bindValue(":create_time", formattedDateTime); query.bindValue(":remark", verInfo.remark); query.bindValue(":img_path", verInfo.img_path); query.bindValue(":tested_device_id", verInfo.tested_device_id); @@ -956,14 +958,15 @@ QSqlQuery query; query.prepare("INSERT INTO zd_communication_setting (id,device_id,communication_type,serial_port,visa,create_time,update_time) " " VALUES (':id',':device_id',':communication_type',':serial_port',':visa',':create_time',':update_time')"); - + QString formattedDateTime = configInterdace.create_time.toString("yyyy-MM-dd HH:mm:ss"); + QString formattedUpdateDateTime = configInterdace.update_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", configInterdace.id); query.bindValue(":device_id", configInterdace.device_id); query.bindValue(":communication_type", configInterdace.communication_type); query.bindValue(":serial_port", configInterdace.serial_port); query.bindValue(":visa", configInterdace.visa); - query.bindValue(":create_time", configInterdace.create_time); - query.bindValue(":update_time", configInterdace.update_time); + query.bindValue(":create_time", formattedDateTime); + query.bindValue(":update_time", formattedUpdateDateTime); bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -1000,10 +1003,11 @@ query.prepare("UPDATE zd_communication_setting SET communication_type = :communication_type, " " serial_port = :serial_port,visa = :visa,update_time = :update_time " " WHERE device_id = :device_id;"); + QString formattedDateTime = configInterdace.update_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":communication_type", configInterdace.communication_type); query.bindValue(":serial_port", configInterdace.serial_port); query.bindValue(":visa", configInterdace.visa); - query.bindValue(":update_time", configInterdace.update_time); + query.bindValue(":update_time", formattedDateTime); query.bindValue(":device_id", configInterdace.device_id); bool isSuccess = query.exec(); if (!isSuccess) { @@ -1071,6 +1075,8 @@ "device_name = :device_name,instruct_config = :instruct_config,instruct_read = :instruct_read," " type = :type,belong_vername = :belong_vername,belong_checkname = :belong_checkname," "update_time = :update_time WHERE id = :id"); + + QString formattedUpdateDateTime = instructionLib.update_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":device_id", instructionLib.device_id); query.bindValue(":device_name", instructionLib.device_name); query.bindValue(":instruct_config", instructionLib.instruct_config); @@ -1078,7 +1084,7 @@ query.bindValue(":type", instructionLib.type); query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); - query.bindValue(":update_time", instructionLib.update_time); + query.bindValue(":update_time", formattedUpdateDateTime); query.bindValue(":id", instructionLib.id); bool isSuccess = query.exec(); if (!isSuccess) { diff --git a/softwareDirectory/AutoVerScheme/databaseconnection.cpp b/softwareDirectory/AutoVerScheme/databaseconnection.cpp index 2d50c6d..2adadd4 100644 --- a/softwareDirectory/AutoVerScheme/databaseconnection.cpp +++ b/softwareDirectory/AutoVerScheme/databaseconnection.cpp @@ -15,7 +15,7 @@ db.setUserName("zdjdcs"); db.setPassword("11111111");*/ db.setHostName("localhost"); - db.setDatabaseName("casic_metering_xichang"); + db.setDatabaseName("zdjd"); db.setPort(3306); db.setUserName("root"); db.setPassword("123456");