diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 79e6ece..f2225ea 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -5,30 +5,34 @@
 
 }
 
-//获取部门任务数据  “1640229293790650370”
-QList<Dept> BaseCommonApi::getAllData(QString userId) {
+//获取部门任务数据
+QList<Dept> BaseCommonApi::getAllData(QString deptId,QString status) {
     QList<Dept> result;
     QSqlQuery query;
 
-    query.prepare("SELECT  bi.id ,br.sample_name , br.sample_model ,ei.help_instruction ,ei.manufacture_no ,"
-               " ei.manufacturer ,bi.customer_name ,dept.FULL_NAME,bi.require_over_time ,bi.is_urgent   "
-               " FROM biz_business_order_info bi LEft JOIN biz_business_order_sample_relation br ON bi.id = br.order_id   "
-               " LEft JOIN eqpt_equipment_info ei ON br.sample_no = ei.equipment_no LEft JOIN sys_dept dept ON ei.dept_id = dept.ID   "
-               " LEft JOIN sys_user ON bi.create_user_id = sys_user.ID "
-               " WHERE sys_user.ID = :userId");
+    query.prepare("SELECT   blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel,eei.help_instruction AS helpInstruction, "
+              " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME,bo.require_over_time, bo.is_urgent "
+              "FROM biz_business_lab_executive_info blei  "
+              "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id "
+              "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID "
+              " JOIN biz_business_order_info bo ON bo.id = blei.order_id   "
+              " WHERE blei.measure_dept_id = :deptId "
+              " AND blei.measure_status = :status "
+              " ORDER BY blei.update_time DESC");
     // 将参数绑定到占位符
-     query.bindValue(":userId", userId);
+     query.bindValue(":deptId", deptId);
+     query.bindValue(":status", status);
 if (query.exec()) {
     while (query.next()) {
         Dept Dept;
         Dept.id = query.value("id").toString();
-        Dept.sample_name = query.value("sample_name").toString();
-        Dept.sample_model = query.value("sample_model").toString();
-        Dept.help_instruction = query.value("help_instruction").toString();
-        Dept.manufacture_no = query.value("manufacture_no").toString();
+        Dept.sample_name = query.value("sampleName").toString();
+        Dept.sample_model = query.value("sampleModel").toString();
+        Dept.help_instruction = query.value("helpInstruction").toString();
+        Dept.manufacture_no = query.value("manufactureNo").toString();
         Dept.manufacturer = query.value("manufacturer").toString();
         Dept.customer_name = query.value("customer_name").toString();
-        Dept.FULL_NAME = query.value("FULL_NAME").toString();
+        Dept.FULL_NAME = query.value("SIMPLE_NAME").toString();
         Dept.require_over_time = query.value("require_over_time").toDateTime();
         Dept.is_urgent = query.value("is_urgent").toString();
         result.append(Dept);
@@ -39,32 +43,34 @@
 
     return result;
 }
-//获取我的任务
-QList<MyTask> BaseCommonApi::getMyTasks(QString userId){
+//获取我的任务  参数登录用户的id 和 任务状态
+QList<MyTask> BaseCommonApi::getMyTasks(QString userId,QString status){
     QList<MyTask> result;
     QSqlQuery query;
-    query.prepare("SELECT "
-               "bi.id, br.sample_name, br.sample_model, ei.help_instruction, ei.manufacture_no,"
-               "ei.manufacturer, bi.customer_name,"
-               "dept.FULL_NAME, bi.require_over_time,"
-               "bi.is_urgent  FROM biz_business_order_info bi"
-              " LEfT JOIN  biz_business_order_sample_relation br ON bi.id = br.order_id"
-              " LEfT JOIN  eqpt_equipment_info ei ON br.sample_no = ei.equipment_no LEfT JOIN "
-               "sys_dept dept ON ei.dept_id = dept.ID WHERE bi.create_user_id = :user_id");
+    query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, "
+                  "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time , bo.is_urgent "
+              "FROM biz_business_lab_executive_info blei "
+              "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id "
+              "JOIN biz_business_order_info bo ON bo.id = blei.order_id "
+              "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID "
+             " WHERE blei.measure_person_id = :userId "
+              " AND blei.measure_status = :status "
+              " ORDER BY blei.update_time DESC");
 
     // 将参数绑定到占位符
-     query.bindValue(":user_id", userId);
+     query.bindValue(":userId", userId);
+     query.bindValue(":status", status);
 if (query.exec()) {
     while (query.next()) {
         MyTask task;
           task.id = query.value("id").toString();
-          task.sample_name = query.value("sample_name").toString();
-          task.sample_model = query.value("sample_model").toString();
-          task.help_instruction = query.value("help_instruction").toString();
-          task.manufacture_no = query.value("manufacture_no").toString();
+          task.sample_name = query.value("sampleName").toString();
+          task.sample_model = query.value("sampleModel").toString();
+          task.help_instruction = query.value("helpInstruction").toString();
+          task.manufacture_no = query.value("manufactureNo").toString();
           task.manufacturer = query.value("manufacturer").toString();
           task.customer_name = query.value("customer_name").toString();
-          task.FULL_NAME = query.value("FULL_NAME").toString();
+          task.FULL_NAME = query.value("measureDeptName").toString();
           task.require_over_time = query.value("require_over_time").toDateTime();
           task.is_urgent = query.value("is_urgent").toString();
           result.append(task);

diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 79e6ece..f2225ea 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -5,30 +5,34 @@
 
 }
 
-//获取部门任务数据  “1640229293790650370”
-QList<Dept> BaseCommonApi::getAllData(QString userId) {
+//获取部门任务数据
+QList<Dept> BaseCommonApi::getAllData(QString deptId,QString status) {
     QList<Dept> result;
     QSqlQuery query;
 
-    query.prepare("SELECT  bi.id ,br.sample_name , br.sample_model ,ei.help_instruction ,ei.manufacture_no ,"
-               " ei.manufacturer ,bi.customer_name ,dept.FULL_NAME,bi.require_over_time ,bi.is_urgent   "
-               " FROM biz_business_order_info bi LEft JOIN biz_business_order_sample_relation br ON bi.id = br.order_id   "
-               " LEft JOIN eqpt_equipment_info ei ON br.sample_no = ei.equipment_no LEft JOIN sys_dept dept ON ei.dept_id = dept.ID   "
-               " LEft JOIN sys_user ON bi.create_user_id = sys_user.ID "
-               " WHERE sys_user.ID = :userId");
+    query.prepare("SELECT   blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel,eei.help_instruction AS helpInstruction, "
+              " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME,bo.require_over_time, bo.is_urgent "
+              "FROM biz_business_lab_executive_info blei  "
+              "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id "
+              "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID "
+              " JOIN biz_business_order_info bo ON bo.id = blei.order_id   "
+              " WHERE blei.measure_dept_id = :deptId "
+              " AND blei.measure_status = :status "
+              " ORDER BY blei.update_time DESC");
     // 将参数绑定到占位符
-     query.bindValue(":userId", userId);
+     query.bindValue(":deptId", deptId);
+     query.bindValue(":status", status);
 if (query.exec()) {
     while (query.next()) {
         Dept Dept;
         Dept.id = query.value("id").toString();
-        Dept.sample_name = query.value("sample_name").toString();
-        Dept.sample_model = query.value("sample_model").toString();
-        Dept.help_instruction = query.value("help_instruction").toString();
-        Dept.manufacture_no = query.value("manufacture_no").toString();
+        Dept.sample_name = query.value("sampleName").toString();
+        Dept.sample_model = query.value("sampleModel").toString();
+        Dept.help_instruction = query.value("helpInstruction").toString();
+        Dept.manufacture_no = query.value("manufactureNo").toString();
         Dept.manufacturer = query.value("manufacturer").toString();
         Dept.customer_name = query.value("customer_name").toString();
-        Dept.FULL_NAME = query.value("FULL_NAME").toString();
+        Dept.FULL_NAME = query.value("SIMPLE_NAME").toString();
         Dept.require_over_time = query.value("require_over_time").toDateTime();
         Dept.is_urgent = query.value("is_urgent").toString();
         result.append(Dept);
@@ -39,32 +43,34 @@
 
     return result;
 }
-//获取我的任务
-QList<MyTask> BaseCommonApi::getMyTasks(QString userId){
+//获取我的任务  参数登录用户的id 和 任务状态
+QList<MyTask> BaseCommonApi::getMyTasks(QString userId,QString status){
     QList<MyTask> result;
     QSqlQuery query;
-    query.prepare("SELECT "
-               "bi.id, br.sample_name, br.sample_model, ei.help_instruction, ei.manufacture_no,"
-               "ei.manufacturer, bi.customer_name,"
-               "dept.FULL_NAME, bi.require_over_time,"
-               "bi.is_urgent  FROM biz_business_order_info bi"
-              " LEfT JOIN  biz_business_order_sample_relation br ON bi.id = br.order_id"
-              " LEfT JOIN  eqpt_equipment_info ei ON br.sample_no = ei.equipment_no LEfT JOIN "
-               "sys_dept dept ON ei.dept_id = dept.ID WHERE bi.create_user_id = :user_id");
+    query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, "
+                  "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time , bo.is_urgent "
+              "FROM biz_business_lab_executive_info blei "
+              "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id "
+              "JOIN biz_business_order_info bo ON bo.id = blei.order_id "
+              "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID "
+             " WHERE blei.measure_person_id = :userId "
+              " AND blei.measure_status = :status "
+              " ORDER BY blei.update_time DESC");
 
     // 将参数绑定到占位符
-     query.bindValue(":user_id", userId);
+     query.bindValue(":userId", userId);
+     query.bindValue(":status", status);
 if (query.exec()) {
     while (query.next()) {
         MyTask task;
           task.id = query.value("id").toString();
-          task.sample_name = query.value("sample_name").toString();
-          task.sample_model = query.value("sample_model").toString();
-          task.help_instruction = query.value("help_instruction").toString();
-          task.manufacture_no = query.value("manufacture_no").toString();
+          task.sample_name = query.value("sampleName").toString();
+          task.sample_model = query.value("sampleModel").toString();
+          task.help_instruction = query.value("helpInstruction").toString();
+          task.manufacture_no = query.value("manufactureNo").toString();
           task.manufacturer = query.value("manufacturer").toString();
           task.customer_name = query.value("customer_name").toString();
-          task.FULL_NAME = query.value("FULL_NAME").toString();
+          task.FULL_NAME = query.value("measureDeptName").toString();
           task.require_over_time = query.value("require_over_time").toDateTime();
           task.is_urgent = query.value("is_urgent").toString();
           result.append(task);
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h
index 89519c5..a113006 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.h
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.h
@@ -447,14 +447,14 @@
 
 
     static QList<QStringList> Search_CalibrationTable(QString DeiverId,QStringList *HeadList);
-    //部门任务
-    static QList<Dept> getAllData();
+    //部门任务 废弃
+//    static QList<Dept> getAllData();
 
 
-    //部门任务  参数登录用户的id
-    static QList<Dept> getAllData(QString userId);
+    //部门任务  参数登录用户的部门id和状态
+    static QList<Dept> getAllData(QString deptId,QString status);
     //我的任务
-    static QList<MyTask> getMyTasks(QString id);
+    static QList<MyTask> getMyTasks(QString id,QString status);
     //获取创建任务首页数据
     static QList<CreateTaskList>getCreateTaskList(QString id);
     //创建任务-查看任务单顶部

diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 79e6ece..f2225ea 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -5,30 +5,34 @@
 
 }
 
-//获取部门任务数据  “1640229293790650370”
-QList<Dept> BaseCommonApi::getAllData(QString userId) {
+//获取部门任务数据
+QList<Dept> BaseCommonApi::getAllData(QString deptId,QString status) {
     QList<Dept> result;
     QSqlQuery query;
 
-    query.prepare("SELECT  bi.id ,br.sample_name , br.sample_model ,ei.help_instruction ,ei.manufacture_no ,"
-               " ei.manufacturer ,bi.customer_name ,dept.FULL_NAME,bi.require_over_time ,bi.is_urgent   "
-               " FROM biz_business_order_info bi LEft JOIN biz_business_order_sample_relation br ON bi.id = br.order_id   "
-               " LEft JOIN eqpt_equipment_info ei ON br.sample_no = ei.equipment_no LEft JOIN sys_dept dept ON ei.dept_id = dept.ID   "
-               " LEft JOIN sys_user ON bi.create_user_id = sys_user.ID "
-               " WHERE sys_user.ID = :userId");
+    query.prepare("SELECT   blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel,eei.help_instruction AS helpInstruction, "
+              " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME,bo.require_over_time, bo.is_urgent "
+              "FROM biz_business_lab_executive_info blei  "
+              "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id "
+              "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID "
+              " JOIN biz_business_order_info bo ON bo.id = blei.order_id   "
+              " WHERE blei.measure_dept_id = :deptId "
+              " AND blei.measure_status = :status "
+              " ORDER BY blei.update_time DESC");
     // 将参数绑定到占位符
-     query.bindValue(":userId", userId);
+     query.bindValue(":deptId", deptId);
+     query.bindValue(":status", status);
 if (query.exec()) {
     while (query.next()) {
         Dept Dept;
         Dept.id = query.value("id").toString();
-        Dept.sample_name = query.value("sample_name").toString();
-        Dept.sample_model = query.value("sample_model").toString();
-        Dept.help_instruction = query.value("help_instruction").toString();
-        Dept.manufacture_no = query.value("manufacture_no").toString();
+        Dept.sample_name = query.value("sampleName").toString();
+        Dept.sample_model = query.value("sampleModel").toString();
+        Dept.help_instruction = query.value("helpInstruction").toString();
+        Dept.manufacture_no = query.value("manufactureNo").toString();
         Dept.manufacturer = query.value("manufacturer").toString();
         Dept.customer_name = query.value("customer_name").toString();
-        Dept.FULL_NAME = query.value("FULL_NAME").toString();
+        Dept.FULL_NAME = query.value("SIMPLE_NAME").toString();
         Dept.require_over_time = query.value("require_over_time").toDateTime();
         Dept.is_urgent = query.value("is_urgent").toString();
         result.append(Dept);
@@ -39,32 +43,34 @@
 
     return result;
 }
-//获取我的任务
-QList<MyTask> BaseCommonApi::getMyTasks(QString userId){
+//获取我的任务  参数登录用户的id 和 任务状态
+QList<MyTask> BaseCommonApi::getMyTasks(QString userId,QString status){
     QList<MyTask> result;
     QSqlQuery query;
-    query.prepare("SELECT "
-               "bi.id, br.sample_name, br.sample_model, ei.help_instruction, ei.manufacture_no,"
-               "ei.manufacturer, bi.customer_name,"
-               "dept.FULL_NAME, bi.require_over_time,"
-               "bi.is_urgent  FROM biz_business_order_info bi"
-              " LEfT JOIN  biz_business_order_sample_relation br ON bi.id = br.order_id"
-              " LEfT JOIN  eqpt_equipment_info ei ON br.sample_no = ei.equipment_no LEfT JOIN "
-               "sys_dept dept ON ei.dept_id = dept.ID WHERE bi.create_user_id = :user_id");
+    query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, "
+                  "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time , bo.is_urgent "
+              "FROM biz_business_lab_executive_info blei "
+              "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id "
+              "JOIN biz_business_order_info bo ON bo.id = blei.order_id "
+              "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID "
+             " WHERE blei.measure_person_id = :userId "
+              " AND blei.measure_status = :status "
+              " ORDER BY blei.update_time DESC");
 
     // 将参数绑定到占位符
-     query.bindValue(":user_id", userId);
+     query.bindValue(":userId", userId);
+     query.bindValue(":status", status);
 if (query.exec()) {
     while (query.next()) {
         MyTask task;
           task.id = query.value("id").toString();
-          task.sample_name = query.value("sample_name").toString();
-          task.sample_model = query.value("sample_model").toString();
-          task.help_instruction = query.value("help_instruction").toString();
-          task.manufacture_no = query.value("manufacture_no").toString();
+          task.sample_name = query.value("sampleName").toString();
+          task.sample_model = query.value("sampleModel").toString();
+          task.help_instruction = query.value("helpInstruction").toString();
+          task.manufacture_no = query.value("manufactureNo").toString();
           task.manufacturer = query.value("manufacturer").toString();
           task.customer_name = query.value("customer_name").toString();
-          task.FULL_NAME = query.value("FULL_NAME").toString();
+          task.FULL_NAME = query.value("measureDeptName").toString();
           task.require_over_time = query.value("require_over_time").toDateTime();
           task.is_urgent = query.value("is_urgent").toString();
           result.append(task);
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h
index 89519c5..a113006 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.h
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.h
@@ -447,14 +447,14 @@
 
 
     static QList<QStringList> Search_CalibrationTable(QString DeiverId,QStringList *HeadList);
-    //部门任务
-    static QList<Dept> getAllData();
+    //部门任务 废弃
+//    static QList<Dept> getAllData();
 
 
-    //部门任务  参数登录用户的id
-    static QList<Dept> getAllData(QString userId);
+    //部门任务  参数登录用户的部门id和状态
+    static QList<Dept> getAllData(QString deptId,QString status);
     //我的任务
-    static QList<MyTask> getMyTasks(QString id);
+    static QList<MyTask> getMyTasks(QString id,QString status);
     //获取创建任务首页数据
     static QList<CreateTaskList>getCreateTaskList(QString id);
     //创建任务-查看任务单顶部
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index a5b8cbc..51650f9 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -63,7 +63,7 @@
 
     //模拟用户ID
     QString userId="1640229293790650370";
-    QList<MyTask> data = BaseCommonApi::getMyTasks(userId);
+    QList<MyTask> data = BaseCommonApi::getMyTasks(userId,"3");
 
     int rowCount = 0;
     int row=0;

diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 79e6ece..f2225ea 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -5,30 +5,34 @@
 
 }
 
-//获取部门任务数据  “1640229293790650370”
-QList<Dept> BaseCommonApi::getAllData(QString userId) {
+//获取部门任务数据
+QList<Dept> BaseCommonApi::getAllData(QString deptId,QString status) {
     QList<Dept> result;
     QSqlQuery query;
 
-    query.prepare("SELECT  bi.id ,br.sample_name , br.sample_model ,ei.help_instruction ,ei.manufacture_no ,"
-               " ei.manufacturer ,bi.customer_name ,dept.FULL_NAME,bi.require_over_time ,bi.is_urgent   "
-               " FROM biz_business_order_info bi LEft JOIN biz_business_order_sample_relation br ON bi.id = br.order_id   "
-               " LEft JOIN eqpt_equipment_info ei ON br.sample_no = ei.equipment_no LEft JOIN sys_dept dept ON ei.dept_id = dept.ID   "
-               " LEft JOIN sys_user ON bi.create_user_id = sys_user.ID "
-               " WHERE sys_user.ID = :userId");
+    query.prepare("SELECT   blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel,eei.help_instruction AS helpInstruction, "
+              " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME,bo.require_over_time, bo.is_urgent "
+              "FROM biz_business_lab_executive_info blei  "
+              "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id "
+              "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID "
+              " JOIN biz_business_order_info bo ON bo.id = blei.order_id   "
+              " WHERE blei.measure_dept_id = :deptId "
+              " AND blei.measure_status = :status "
+              " ORDER BY blei.update_time DESC");
     // 将参数绑定到占位符
-     query.bindValue(":userId", userId);
+     query.bindValue(":deptId", deptId);
+     query.bindValue(":status", status);
 if (query.exec()) {
     while (query.next()) {
         Dept Dept;
         Dept.id = query.value("id").toString();
-        Dept.sample_name = query.value("sample_name").toString();
-        Dept.sample_model = query.value("sample_model").toString();
-        Dept.help_instruction = query.value("help_instruction").toString();
-        Dept.manufacture_no = query.value("manufacture_no").toString();
+        Dept.sample_name = query.value("sampleName").toString();
+        Dept.sample_model = query.value("sampleModel").toString();
+        Dept.help_instruction = query.value("helpInstruction").toString();
+        Dept.manufacture_no = query.value("manufactureNo").toString();
         Dept.manufacturer = query.value("manufacturer").toString();
         Dept.customer_name = query.value("customer_name").toString();
-        Dept.FULL_NAME = query.value("FULL_NAME").toString();
+        Dept.FULL_NAME = query.value("SIMPLE_NAME").toString();
         Dept.require_over_time = query.value("require_over_time").toDateTime();
         Dept.is_urgent = query.value("is_urgent").toString();
         result.append(Dept);
@@ -39,32 +43,34 @@
 
     return result;
 }
-//获取我的任务
-QList<MyTask> BaseCommonApi::getMyTasks(QString userId){
+//获取我的任务  参数登录用户的id 和 任务状态
+QList<MyTask> BaseCommonApi::getMyTasks(QString userId,QString status){
     QList<MyTask> result;
     QSqlQuery query;
-    query.prepare("SELECT "
-               "bi.id, br.sample_name, br.sample_model, ei.help_instruction, ei.manufacture_no,"
-               "ei.manufacturer, bi.customer_name,"
-               "dept.FULL_NAME, bi.require_over_time,"
-               "bi.is_urgent  FROM biz_business_order_info bi"
-              " LEfT JOIN  biz_business_order_sample_relation br ON bi.id = br.order_id"
-              " LEfT JOIN  eqpt_equipment_info ei ON br.sample_no = ei.equipment_no LEfT JOIN "
-               "sys_dept dept ON ei.dept_id = dept.ID WHERE bi.create_user_id = :user_id");
+    query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, "
+                  "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time , bo.is_urgent "
+              "FROM biz_business_lab_executive_info blei "
+              "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id "
+              "JOIN biz_business_order_info bo ON bo.id = blei.order_id "
+              "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID "
+             " WHERE blei.measure_person_id = :userId "
+              " AND blei.measure_status = :status "
+              " ORDER BY blei.update_time DESC");
 
     // 将参数绑定到占位符
-     query.bindValue(":user_id", userId);
+     query.bindValue(":userId", userId);
+     query.bindValue(":status", status);
 if (query.exec()) {
     while (query.next()) {
         MyTask task;
           task.id = query.value("id").toString();
-          task.sample_name = query.value("sample_name").toString();
-          task.sample_model = query.value("sample_model").toString();
-          task.help_instruction = query.value("help_instruction").toString();
-          task.manufacture_no = query.value("manufacture_no").toString();
+          task.sample_name = query.value("sampleName").toString();
+          task.sample_model = query.value("sampleModel").toString();
+          task.help_instruction = query.value("helpInstruction").toString();
+          task.manufacture_no = query.value("manufactureNo").toString();
           task.manufacturer = query.value("manufacturer").toString();
           task.customer_name = query.value("customer_name").toString();
-          task.FULL_NAME = query.value("FULL_NAME").toString();
+          task.FULL_NAME = query.value("measureDeptName").toString();
           task.require_over_time = query.value("require_over_time").toDateTime();
           task.is_urgent = query.value("is_urgent").toString();
           result.append(task);
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h
index 89519c5..a113006 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.h
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.h
@@ -447,14 +447,14 @@
 
 
     static QList<QStringList> Search_CalibrationTable(QString DeiverId,QStringList *HeadList);
-    //部门任务
-    static QList<Dept> getAllData();
+    //部门任务 废弃
+//    static QList<Dept> getAllData();
 
 
-    //部门任务  参数登录用户的id
-    static QList<Dept> getAllData(QString userId);
+    //部门任务  参数登录用户的部门id和状态
+    static QList<Dept> getAllData(QString deptId,QString status);
     //我的任务
-    static QList<MyTask> getMyTasks(QString id);
+    static QList<MyTask> getMyTasks(QString id,QString status);
     //获取创建任务首页数据
     static QList<CreateTaskList>getCreateTaskList(QString id);
     //创建任务-查看任务单顶部
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index a5b8cbc..51650f9 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -63,7 +63,7 @@
 
     //模拟用户ID
     QString userId="1640229293790650370";
-    QList<MyTask> data = BaseCommonApi::getMyTasks(userId);
+    QList<MyTask> data = BaseCommonApi::getMyTasks(userId,"3");
 
     int rowCount = 0;
     int row=0;
diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp
index d442b65..13b1855 100644
--- a/softwareDirectory/AutoVerScheme/depar_task.cpp
+++ b/softwareDirectory/AutoVerScheme/depar_task.cpp
@@ -79,8 +79,8 @@
     // 调用数据库管理器的函数获取数据
     //QList<Dept> data = dbManager.getAllData();
     //模拟用户ID
-    QString userId="1640229293790650370";
-    QList<Dept> data = BaseCommonApi::getAllData(userId);
+    QString deptId="1601423748184150017";
+    QList<Dept> data = BaseCommonApi::getAllData(deptId,"3");
 
     int rowCount = 0;
     int row=0;

diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 79e6ece..f2225ea 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -5,30 +5,34 @@
 
 }
 
-//获取部门任务数据  “1640229293790650370”
-QList<Dept> BaseCommonApi::getAllData(QString userId) {
+//获取部门任务数据
+QList<Dept> BaseCommonApi::getAllData(QString deptId,QString status) {
     QList<Dept> result;
     QSqlQuery query;
 
-    query.prepare("SELECT  bi.id ,br.sample_name , br.sample_model ,ei.help_instruction ,ei.manufacture_no ,"
-               " ei.manufacturer ,bi.customer_name ,dept.FULL_NAME,bi.require_over_time ,bi.is_urgent   "
-               " FROM biz_business_order_info bi LEft JOIN biz_business_order_sample_relation br ON bi.id = br.order_id   "
-               " LEft JOIN eqpt_equipment_info ei ON br.sample_no = ei.equipment_no LEft JOIN sys_dept dept ON ei.dept_id = dept.ID   "
-               " LEft JOIN sys_user ON bi.create_user_id = sys_user.ID "
-               " WHERE sys_user.ID = :userId");
+    query.prepare("SELECT   blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel,eei.help_instruction AS helpInstruction, "
+              " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME,bo.require_over_time, bo.is_urgent "
+              "FROM biz_business_lab_executive_info blei  "
+              "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id "
+              "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID "
+              " JOIN biz_business_order_info bo ON bo.id = blei.order_id   "
+              " WHERE blei.measure_dept_id = :deptId "
+              " AND blei.measure_status = :status "
+              " ORDER BY blei.update_time DESC");
     // 将参数绑定到占位符
-     query.bindValue(":userId", userId);
+     query.bindValue(":deptId", deptId);
+     query.bindValue(":status", status);
 if (query.exec()) {
     while (query.next()) {
         Dept Dept;
         Dept.id = query.value("id").toString();
-        Dept.sample_name = query.value("sample_name").toString();
-        Dept.sample_model = query.value("sample_model").toString();
-        Dept.help_instruction = query.value("help_instruction").toString();
-        Dept.manufacture_no = query.value("manufacture_no").toString();
+        Dept.sample_name = query.value("sampleName").toString();
+        Dept.sample_model = query.value("sampleModel").toString();
+        Dept.help_instruction = query.value("helpInstruction").toString();
+        Dept.manufacture_no = query.value("manufactureNo").toString();
         Dept.manufacturer = query.value("manufacturer").toString();
         Dept.customer_name = query.value("customer_name").toString();
-        Dept.FULL_NAME = query.value("FULL_NAME").toString();
+        Dept.FULL_NAME = query.value("SIMPLE_NAME").toString();
         Dept.require_over_time = query.value("require_over_time").toDateTime();
         Dept.is_urgent = query.value("is_urgent").toString();
         result.append(Dept);
@@ -39,32 +43,34 @@
 
     return result;
 }
-//获取我的任务
-QList<MyTask> BaseCommonApi::getMyTasks(QString userId){
+//获取我的任务  参数登录用户的id 和 任务状态
+QList<MyTask> BaseCommonApi::getMyTasks(QString userId,QString status){
     QList<MyTask> result;
     QSqlQuery query;
-    query.prepare("SELECT "
-               "bi.id, br.sample_name, br.sample_model, ei.help_instruction, ei.manufacture_no,"
-               "ei.manufacturer, bi.customer_name,"
-               "dept.FULL_NAME, bi.require_over_time,"
-               "bi.is_urgent  FROM biz_business_order_info bi"
-              " LEfT JOIN  biz_business_order_sample_relation br ON bi.id = br.order_id"
-              " LEfT JOIN  eqpt_equipment_info ei ON br.sample_no = ei.equipment_no LEfT JOIN "
-               "sys_dept dept ON ei.dept_id = dept.ID WHERE bi.create_user_id = :user_id");
+    query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, "
+                  "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time , bo.is_urgent "
+              "FROM biz_business_lab_executive_info blei "
+              "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id "
+              "JOIN biz_business_order_info bo ON bo.id = blei.order_id "
+              "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID "
+             " WHERE blei.measure_person_id = :userId "
+              " AND blei.measure_status = :status "
+              " ORDER BY blei.update_time DESC");
 
     // 将参数绑定到占位符
-     query.bindValue(":user_id", userId);
+     query.bindValue(":userId", userId);
+     query.bindValue(":status", status);
 if (query.exec()) {
     while (query.next()) {
         MyTask task;
           task.id = query.value("id").toString();
-          task.sample_name = query.value("sample_name").toString();
-          task.sample_model = query.value("sample_model").toString();
-          task.help_instruction = query.value("help_instruction").toString();
-          task.manufacture_no = query.value("manufacture_no").toString();
+          task.sample_name = query.value("sampleName").toString();
+          task.sample_model = query.value("sampleModel").toString();
+          task.help_instruction = query.value("helpInstruction").toString();
+          task.manufacture_no = query.value("manufactureNo").toString();
           task.manufacturer = query.value("manufacturer").toString();
           task.customer_name = query.value("customer_name").toString();
-          task.FULL_NAME = query.value("FULL_NAME").toString();
+          task.FULL_NAME = query.value("measureDeptName").toString();
           task.require_over_time = query.value("require_over_time").toDateTime();
           task.is_urgent = query.value("is_urgent").toString();
           result.append(task);
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h
index 89519c5..a113006 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.h
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.h
@@ -447,14 +447,14 @@
 
 
     static QList<QStringList> Search_CalibrationTable(QString DeiverId,QStringList *HeadList);
-    //部门任务
-    static QList<Dept> getAllData();
+    //部门任务 废弃
+//    static QList<Dept> getAllData();
 
 
-    //部门任务  参数登录用户的id
-    static QList<Dept> getAllData(QString userId);
+    //部门任务  参数登录用户的部门id和状态
+    static QList<Dept> getAllData(QString deptId,QString status);
     //我的任务
-    static QList<MyTask> getMyTasks(QString id);
+    static QList<MyTask> getMyTasks(QString id,QString status);
     //获取创建任务首页数据
     static QList<CreateTaskList>getCreateTaskList(QString id);
     //创建任务-查看任务单顶部
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index a5b8cbc..51650f9 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -63,7 +63,7 @@
 
     //模拟用户ID
     QString userId="1640229293790650370";
-    QList<MyTask> data = BaseCommonApi::getMyTasks(userId);
+    QList<MyTask> data = BaseCommonApi::getMyTasks(userId,"3");
 
     int rowCount = 0;
     int row=0;
diff --git a/softwareDirectory/AutoVerScheme/depar_task.cpp b/softwareDirectory/AutoVerScheme/depar_task.cpp
index d442b65..13b1855 100644
--- a/softwareDirectory/AutoVerScheme/depar_task.cpp
+++ b/softwareDirectory/AutoVerScheme/depar_task.cpp
@@ -79,8 +79,8 @@
     // 调用数据库管理器的函数获取数据
     //QList<Dept> data = dbManager.getAllData();
     //模拟用户ID
-    QString userId="1640229293790650370";
-    QList<Dept> data = BaseCommonApi::getAllData(userId);
+    QString deptId="1601423748184150017";
+    QList<Dept> data = BaseCommonApi::getAllData(deptId,"3");
 
     int rowCount = 0;
     int row=0;
diff --git a/softwareDirectory/AutoVerScheme/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp
index fb72684..bae72d0 100644
--- a/softwareDirectory/AutoVerScheme/my_task.cpp
+++ b/softwareDirectory/AutoVerScheme/my_task.cpp
@@ -69,8 +69,8 @@
 
     // 调用数据库管理器的函数获取数据
     //模拟用户ID
-    QString userId="1640229293790650370";
-    QList<MyTask> data = BaseCommonApi::getMyTasks(userId);
+    QString userId="1695282436182188034";
+    QList<MyTask> data = BaseCommonApi::getMyTasks(userId,"3");
 
     int rowCount = 0;
     int row=0;