diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index ff58124..3128bb9 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -7,6 +7,59 @@
 }
 QString BaseCommonApi::temporary_user_id="1640229293790650370";
 QString BaseCommonApi::temporary_costomer_id="1692432193177047042";
+
+
+//sys_user表的id转换为measure_person_id 检定人id（meter_staff表id）
+StaffInfo BaseCommonApi::ConvertStaffInfo(QString userId)
+{
+    StaffInfo result;
+    QSqlQuery query;
+    query.prepare("SELECT brsi.* from biz_resource_staff_info brsi "
+                  " JOIN sys_user ON sys_user.ACCOUNT = brsi.account "
+                  " WHERE sys_user.id = :userId ");
+
+     query.bindValue(":userId", userId);
+     if (query.exec()) {
+         while (query.next()) {
+             StaffInfo info;
+             info.id = query.value("id").toString();
+             info.account = query.value("account").toString();
+             info.staff_no = query.value("staff_no").toString();
+             info.staff_name = query.value("staff_name").toString();
+             info.picture_file = query.value("picture_file").toString();
+             info.id_card = query.value("id_card").toString();
+             info.birthday = query.value("birthday").toString();
+             info.native_place = query.value("native_place").toString();
+             info.education = query.value("education").toString();
+             info.record_date = query.value("record_date").toString();
+             info.officer_no = query.value("officer_no").toString();
+             info.gender = query.value("gender").toString();
+             info.graduation_date = query.value("graduation_date").toString();
+             info.nation = query.value("nation").toString();
+             info.degree = query.value("degree").toString();
+             info.dept_id = query.value("dept_id").toString();
+             info.dept_name = query.value("dept_name").toString();
+             info.station = query.value("station").toString();
+             info.major = query.value("major").toString();
+             info.certificate_number = query.value("certificate_number").toString();
+             info.engage_date = query.value("engage_date").toString();
+             info.working_age = query.value("working_age").toString();
+             info.title_initial_date = query.value("title_initial_date").toString();
+             info.remark = query.value("remark").toString();
+             info.create_time = query.value("create_time").toDateTime();
+             info.update_time = query.value("update_time").toDateTime();
+             result=info;
+         }
+         }else {
+         qDebug() << "Query execution failed: " << query.lastError().text();
+     }
+
+         return result;
+}
+
+
+
+
 //获取部门任务数据
 QList<Dept> BaseCommonApi::getAllData(QString deptId,QString status) {
     QList<Dept> result;
@@ -392,25 +445,20 @@
 bool BaseCommonApi::DeleteTask(QString id)
 {
     QSqlQuery query;
-      //删除任务单表
-      query.prepare("DELETE FROM biz_business_order_info WHERE id = :id");
-      query.bindValue(":id", id);
-
-      if (!query.exec()) {
-          qDebug() << "删除失败: " << query.lastError().text();
-          return false;
-      }
-
-      //删除任务单样品表
-      query.prepare("DELETE FROM biz_business_order_sample_relation WHERE order_id = :id");
-      query.bindValue(":id", id);
-
-      if (!query.exec()) {
-          qDebug() << "删除失败 " << query.lastError().text();
-          return false;
-      }
-
-      return true;
+    bool allSuccessful = true;
+    // 定义一个删除函数，用于复用删除逻辑
+       auto deleteRecord = [&](const QString& tableName) {
+           query.prepare("DELETE FROM " + tableName + " WHERE order_id = :id");
+           query.bindValue(":id", id);
+           if (!query.exec()) {
+               qDebug() << "删除" << tableName << "表中的记录失败: " << query.lastError().text();
+               allSuccessful = false;
+           }
+       };
+       deleteRecord("biz_business_order_info");
+       deleteRecord("biz_business_order_sample_relation");
+       deleteRecord("biz_business_lab_executive_info");
+       return allSuccessful;
 }
 //删除任务单内设备
 bool BaseCommonApi::DeleteTaskDevice(QString id)
@@ -736,13 +784,11 @@
 QList<QStringList> BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList)
 {
     QList<QStringList> DataList;
-    JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId);
-    if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList;
-    switch(CliTable.belong_standard_equipment.toInt())
+    QList<JudgeCalibrationTable> CliTable=BaseCommonApi::getJudgeCalibrationTable(DeiverId);
+    if(CliTable.count()==0)return DataList;
+     switch (CliTable[0].belong_standard_equipment.toInt())
     {
        case 1: //多功能校准源
-
-
           DataList =  BaseCommonApi::getVerificationMultiCalResultData(dataId,HeadList);
         break;
     }
@@ -833,6 +879,7 @@
             VerificationData verificationData;
             verificationData.id = query.value("id").toString();
             verificationData.sample_id = query.value("sample_id").toString();
+            verificationData.item_id = query.value("item_id").toString();
             verificationData.sample_name = query.value("sample_name").toString();
             verificationData.model = query.value("model").toString();
             verificationData.help_instruction = query.value("help_instruction").toString();
@@ -884,7 +931,7 @@
 
      return result;
 }
-//检定数据管理-检定基本信息
+//检定数据管理-检定基本信息  参数item_id 首页单条数据中包含
 VerificationBasicDataDetails BaseCommonApi::getVerificationBasicDataDetails(QString item_id)
 {
     VerificationBasicDataDetails result;
@@ -972,7 +1019,7 @@
                              " 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 ");
- if (isSuccess) {
+    if (isSuccess) {
          while (query.next()) {
              CheckData dataManage;
              dataManage.id = query.value("id").toString();

diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index ff58124..3128bb9 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -7,6 +7,59 @@
 }
 QString BaseCommonApi::temporary_user_id="1640229293790650370";
 QString BaseCommonApi::temporary_costomer_id="1692432193177047042";
+
+
+//sys_user表的id转换为measure_person_id 检定人id（meter_staff表id）
+StaffInfo BaseCommonApi::ConvertStaffInfo(QString userId)
+{
+    StaffInfo result;
+    QSqlQuery query;
+    query.prepare("SELECT brsi.* from biz_resource_staff_info brsi "
+                  " JOIN sys_user ON sys_user.ACCOUNT = brsi.account "
+                  " WHERE sys_user.id = :userId ");
+
+     query.bindValue(":userId", userId);
+     if (query.exec()) {
+         while (query.next()) {
+             StaffInfo info;
+             info.id = query.value("id").toString();
+             info.account = query.value("account").toString();
+             info.staff_no = query.value("staff_no").toString();
+             info.staff_name = query.value("staff_name").toString();
+             info.picture_file = query.value("picture_file").toString();
+             info.id_card = query.value("id_card").toString();
+             info.birthday = query.value("birthday").toString();
+             info.native_place = query.value("native_place").toString();
+             info.education = query.value("education").toString();
+             info.record_date = query.value("record_date").toString();
+             info.officer_no = query.value("officer_no").toString();
+             info.gender = query.value("gender").toString();
+             info.graduation_date = query.value("graduation_date").toString();
+             info.nation = query.value("nation").toString();
+             info.degree = query.value("degree").toString();
+             info.dept_id = query.value("dept_id").toString();
+             info.dept_name = query.value("dept_name").toString();
+             info.station = query.value("station").toString();
+             info.major = query.value("major").toString();
+             info.certificate_number = query.value("certificate_number").toString();
+             info.engage_date = query.value("engage_date").toString();
+             info.working_age = query.value("working_age").toString();
+             info.title_initial_date = query.value("title_initial_date").toString();
+             info.remark = query.value("remark").toString();
+             info.create_time = query.value("create_time").toDateTime();
+             info.update_time = query.value("update_time").toDateTime();
+             result=info;
+         }
+         }else {
+         qDebug() << "Query execution failed: " << query.lastError().text();
+     }
+
+         return result;
+}
+
+
+
+
 //获取部门任务数据
 QList<Dept> BaseCommonApi::getAllData(QString deptId,QString status) {
     QList<Dept> result;
@@ -392,25 +445,20 @@
 bool BaseCommonApi::DeleteTask(QString id)
 {
     QSqlQuery query;
-      //删除任务单表
-      query.prepare("DELETE FROM biz_business_order_info WHERE id = :id");
-      query.bindValue(":id", id);
-
-      if (!query.exec()) {
-          qDebug() << "删除失败: " << query.lastError().text();
-          return false;
-      }
-
-      //删除任务单样品表
-      query.prepare("DELETE FROM biz_business_order_sample_relation WHERE order_id = :id");
-      query.bindValue(":id", id);
-
-      if (!query.exec()) {
-          qDebug() << "删除失败 " << query.lastError().text();
-          return false;
-      }
-
-      return true;
+    bool allSuccessful = true;
+    // 定义一个删除函数，用于复用删除逻辑
+       auto deleteRecord = [&](const QString& tableName) {
+           query.prepare("DELETE FROM " + tableName + " WHERE order_id = :id");
+           query.bindValue(":id", id);
+           if (!query.exec()) {
+               qDebug() << "删除" << tableName << "表中的记录失败: " << query.lastError().text();
+               allSuccessful = false;
+           }
+       };
+       deleteRecord("biz_business_order_info");
+       deleteRecord("biz_business_order_sample_relation");
+       deleteRecord("biz_business_lab_executive_info");
+       return allSuccessful;
 }
 //删除任务单内设备
 bool BaseCommonApi::DeleteTaskDevice(QString id)
@@ -736,13 +784,11 @@
 QList<QStringList> BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList)
 {
     QList<QStringList> DataList;
-    JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId);
-    if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList;
-    switch(CliTable.belong_standard_equipment.toInt())
+    QList<JudgeCalibrationTable> CliTable=BaseCommonApi::getJudgeCalibrationTable(DeiverId);
+    if(CliTable.count()==0)return DataList;
+     switch (CliTable[0].belong_standard_equipment.toInt())
     {
        case 1: //多功能校准源
-
-
           DataList =  BaseCommonApi::getVerificationMultiCalResultData(dataId,HeadList);
         break;
     }
@@ -833,6 +879,7 @@
             VerificationData verificationData;
             verificationData.id = query.value("id").toString();
             verificationData.sample_id = query.value("sample_id").toString();
+            verificationData.item_id = query.value("item_id").toString();
             verificationData.sample_name = query.value("sample_name").toString();
             verificationData.model = query.value("model").toString();
             verificationData.help_instruction = query.value("help_instruction").toString();
@@ -884,7 +931,7 @@
 
      return result;
 }
-//检定数据管理-检定基本信息
+//检定数据管理-检定基本信息  参数item_id 首页单条数据中包含
 VerificationBasicDataDetails BaseCommonApi::getVerificationBasicDataDetails(QString item_id)
 {
     VerificationBasicDataDetails result;
@@ -972,7 +1019,7 @@
                              " 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 ");
- if (isSuccess) {
+    if (isSuccess) {
          while (query.next()) {
              CheckData dataManage;
              dataManage.id = query.value("id").toString();
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h
index 7e8d9a3..74943d4 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.h
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.h
@@ -298,6 +298,7 @@
 {
 public:
 QString id;
+QString item_id;//设备检定项表id(一条检定数据对应一个检定项)
 QString sample_name;//设备名称
 QString sample_id;//被检设备id
 QString model;//型号规格
@@ -760,6 +761,37 @@
     QDateTime create_time;
     QDateTime update_time;
 };
+//资源管理-人员管理基础信息
+class StaffInfo
+{
+public:
+    QString id;
+    QString account;//登录账号
+    QString staff_no;//人员编号
+    QString staff_name;//姓名
+    QString picture_file;//照片
+    QString id_card;//身份证
+    QString birthday;//生日
+    QString native_place;//籍贯
+    QString education;//学历
+    QString record_date;//建档时间
+    QString officer_no;//军官证号
+    QString gender;//新别
+    QString graduation_date;//毕业时间
+    QString nation;//民族
+    QString degree;//学位
+    QString dept_id;//部门id
+    QString dept_name;//部门名字
+    QString station;//岗位
+    QString major;//计量专业
+    QString certificate_number;//证号
+    QString engage_date;//从事时间
+    QString working_age;//干龄
+    QString title_initial_date;//职称 初评
+    QString remark;//备注
+    QDateTime create_time;
+    QDateTime update_time;
+};
 
 
 
@@ -784,6 +816,10 @@
     //判断核查数据管理 结果信息表
      static QList<QStringList> Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList);
 
+    //sys_user表的id转换为measure_person_id 检定人id（meter_staff表id）
+     static StaffInfo ConvertStaffInfo(QString userId);
+
+
 
     //部门任务 废弃
 //    static QList<Dept> getAllData();