diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 931a7c1..638816d 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -5,15 +5,20 @@
 
 }
 
-//获取部门任务数据
-QList<Dept> BaseCommonApi::getAllData() {
+//获取部门任务数据  “1640229293790650370”
+QList<Dept> BaseCommonApi::getAllData(QString userId) {
     QList<Dept> result;
-
-
     QSqlQuery query;
 
-    query.exec("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 user ON user.ID = bi.create_user_id");
-
+    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.bindValue(":userId", userId);
+if (query.exec()) {
     while (query.next()) {
         Dept Dept;
         Dept.id = query.value("id").toString();
@@ -28,11 +33,14 @@
         Dept.is_urgent = query.value("is_urgent").toString();
         result.append(Dept);
     }
+    }else {
+    qDebug() << "Query execution failed: " << query.lastError().text();
+}
 
     return result;
 }
 //获取我的任务
-QList<MyTask> BaseCommonApi::getMyTasks(QString id){
+QList<MyTask> BaseCommonApi::getMyTasks(QString userId){
     QList<MyTask> result;
     QSqlQuery query;
     query.prepare("SELECT "
@@ -45,7 +53,7 @@
                "sys_dept dept ON ei.dept_id = dept.ID WHERE bi.create_user_id = :user_id");
 
     // 将参数绑定到占位符
-     query.bindValue(":user_id", id);
+     query.bindValue(":user_id", userId);
 if (query.exec()) {
     while (query.next()) {
         MyTask task;
@@ -67,8 +75,71 @@
     }
     return result;
 }
-
 //获取创建任务首页数据
+QList<CreateTaskList>getCreateTaskList(QString userId)
+{
+    QList<CreateTaskList> result;
+    QSqlQuery query;
+    query.prepare("SELECT bi.id,bi.order_no,bi.customer_name,dept.FULL_NAME,bi.require_over_time,bi.deliverer,bi.is_urgent "
+                  " FROM biz_business_order_info bi LEFT JOIN sys_dept dept ON bi.customer_id = dept.ID "
+                  " WHERE bi.create_user_id = ':userId' ");
+    // 将参数绑定到占位符
+     query.bindValue(":userId", userId);
+     if (query.exec()) {
+            while (query.next()) {
+                CreateTaskList task;
+                task.id = query.value("id").toString();
+                task.order_no = query.value("order_no").toString();
+                task.customer_name = query.value("customer_name").toString();
+                task.DEPT_FULL_NAME = query.value("FULL_NAME").toString();
+                task.require_over_time = query.value("require_over_time").toDateTime();
+                task.deliverer = query.value("deliverer").toString();
+                task.is_urgent = query.value("is_urgent").toString();
+                result.append(task);
+            }
+        } else {
+            qDebug() << "Query execution failed: " << query.lastError().text();
+        }
+
+        return result;
+}
+//创建任务单-查看/编辑 顶部数据  传参该条数据的id
+QList<CatTask>BaseCommonApi::getCatTask(QString id)
+{
+    QList<CatTask> result;
+    QSqlQuery query;
+    query.prepare("SELECT  bi.order_no ,bi.customer_name ,dept.FULL_NAME ,bi.require_over_time ,"
+                  " bi.deliverer ,bi.deliverer_tel ,bi.undertaker_name ,bi.undertake_time ,  bi.is_urgent AS ,"
+                  " bi.receive_illustrate  FROM biz_business_order_info bi LEFT JOIN sys_dept dept ON bi.customer_id = dept.ID"
+                  " WHERE  bi.id = ' :id '");
+    // 将参数绑定到占位符
+     query.bindValue(":id", id);
+     if (query.exec()) {
+            while (query.next()) {
+                CatTask task;
+                task.order_no = query.value("order_no").toString();
+                task.customer_name = query.value("customer_name").toString();
+                task.DEPT_FULL_NAME = query.value("FULL_NAME").toString();
+                task.require_over_time = query.value("require_over_time").toDateTime();
+                task.deliverer = query.value("deliverer").toString();
+                task.deliverer_tel = query.value("deliverer_tel").toString();
+                task.undertaker_name = query.value("undertaker_name").toString();
+                task.undertake_time = query.value("undertake_time").toDateTime();
+                task.is_urgent = query.value("is_urgent").toString();
+                task.receive_illustrate = query.value("receive_illustrate").toString();
+                result.append(task);
+            }
+        } else {
+            qDebug() << "Query execution failed: " << query.lastError().text();
+        }
+
+        return result;
+}
+
+
+
+
+//获取创建任务 -任务单列表
 QList<CatTaskList>BaseCommonApi::getCatTaskList(QString orderId)
 {
     QList<CatTaskList> result;

diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 931a7c1..638816d 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -5,15 +5,20 @@
 
 }
 
-//获取部门任务数据
-QList<Dept> BaseCommonApi::getAllData() {
+//获取部门任务数据  “1640229293790650370”
+QList<Dept> BaseCommonApi::getAllData(QString userId) {
     QList<Dept> result;
-
-
     QSqlQuery query;
 
-    query.exec("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 user ON user.ID = bi.create_user_id");
-
+    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.bindValue(":userId", userId);
+if (query.exec()) {
     while (query.next()) {
         Dept Dept;
         Dept.id = query.value("id").toString();
@@ -28,11 +33,14 @@
         Dept.is_urgent = query.value("is_urgent").toString();
         result.append(Dept);
     }
+    }else {
+    qDebug() << "Query execution failed: " << query.lastError().text();
+}
 
     return result;
 }
 //获取我的任务
-QList<MyTask> BaseCommonApi::getMyTasks(QString id){
+QList<MyTask> BaseCommonApi::getMyTasks(QString userId){
     QList<MyTask> result;
     QSqlQuery query;
     query.prepare("SELECT "
@@ -45,7 +53,7 @@
                "sys_dept dept ON ei.dept_id = dept.ID WHERE bi.create_user_id = :user_id");
 
     // 将参数绑定到占位符
-     query.bindValue(":user_id", id);
+     query.bindValue(":user_id", userId);
 if (query.exec()) {
     while (query.next()) {
         MyTask task;
@@ -67,8 +75,71 @@
     }
     return result;
 }
-
 //获取创建任务首页数据
+QList<CreateTaskList>getCreateTaskList(QString userId)
+{
+    QList<CreateTaskList> result;
+    QSqlQuery query;
+    query.prepare("SELECT bi.id,bi.order_no,bi.customer_name,dept.FULL_NAME,bi.require_over_time,bi.deliverer,bi.is_urgent "
+                  " FROM biz_business_order_info bi LEFT JOIN sys_dept dept ON bi.customer_id = dept.ID "
+                  " WHERE bi.create_user_id = ':userId' ");
+    // 将参数绑定到占位符
+     query.bindValue(":userId", userId);
+     if (query.exec()) {
+            while (query.next()) {
+                CreateTaskList task;
+                task.id = query.value("id").toString();
+                task.order_no = query.value("order_no").toString();
+                task.customer_name = query.value("customer_name").toString();
+                task.DEPT_FULL_NAME = query.value("FULL_NAME").toString();
+                task.require_over_time = query.value("require_over_time").toDateTime();
+                task.deliverer = query.value("deliverer").toString();
+                task.is_urgent = query.value("is_urgent").toString();
+                result.append(task);
+            }
+        } else {
+            qDebug() << "Query execution failed: " << query.lastError().text();
+        }
+
+        return result;
+}
+//创建任务单-查看/编辑 顶部数据  传参该条数据的id
+QList<CatTask>BaseCommonApi::getCatTask(QString id)
+{
+    QList<CatTask> result;
+    QSqlQuery query;
+    query.prepare("SELECT  bi.order_no ,bi.customer_name ,dept.FULL_NAME ,bi.require_over_time ,"
+                  " bi.deliverer ,bi.deliverer_tel ,bi.undertaker_name ,bi.undertake_time ,  bi.is_urgent AS ,"
+                  " bi.receive_illustrate  FROM biz_business_order_info bi LEFT JOIN sys_dept dept ON bi.customer_id = dept.ID"
+                  " WHERE  bi.id = ' :id '");
+    // 将参数绑定到占位符
+     query.bindValue(":id", id);
+     if (query.exec()) {
+            while (query.next()) {
+                CatTask task;
+                task.order_no = query.value("order_no").toString();
+                task.customer_name = query.value("customer_name").toString();
+                task.DEPT_FULL_NAME = query.value("FULL_NAME").toString();
+                task.require_over_time = query.value("require_over_time").toDateTime();
+                task.deliverer = query.value("deliverer").toString();
+                task.deliverer_tel = query.value("deliverer_tel").toString();
+                task.undertaker_name = query.value("undertaker_name").toString();
+                task.undertake_time = query.value("undertake_time").toDateTime();
+                task.is_urgent = query.value("is_urgent").toString();
+                task.receive_illustrate = query.value("receive_illustrate").toString();
+                result.append(task);
+            }
+        } else {
+            qDebug() << "Query execution failed: " << query.lastError().text();
+        }
+
+        return result;
+}
+
+
+
+
+//获取创建任务 -任务单列表
 QList<CatTaskList>BaseCommonApi::getCatTaskList(QString orderId)
 {
     QList<CatTaskList> result;
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h
index 49cf892..1b70cb9 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.h
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.h
@@ -61,7 +61,7 @@
     QString order_no;
     QString customer_name;
     QString DEPT_FULL_NAME;
-    QString require_over_time;
+    QDateTime require_over_time;
     QString deliverer;
     QString deliverer_tel;
     QString undertaker_name;
@@ -444,12 +444,12 @@
 public:
     BaseCommonApi();
 
-    //部门任务
-    static QList<Dept> getAllData();
+    //部门任务  参数登录用户的id
+    static QList<Dept> getAllData(QString userId);
     //我的任务
     static QList<MyTask> getMyTasks(QString id);
     //获取创建任务首页数据
-    static QList<CreateTaskList>getCreateTaskList();
+    static QList<CreateTaskList>getCreateTaskList(QString id);
     //创建任务-查看任务单顶部
     static QList<CatTask>getCatTask(QString orderNo);
     //创建任务-查看任务列表底部