我的发布子页面后端函数更改

DAPlatform/dao/Task.py

@@ -91,11 +91,23 @@ def find_task(start, num):
         return Result(1, "find success", list, math.ceil(len(find) / num))
 
 
-# 查找与该发布者相关的任务(用于我的发布界面）
-def find_task_by_creator(creator, start, num):
+# 查找与该发布者相关的任务(用于我的发布界面和待审核界面）
+def find_task_by_creator(creator, start, num, state):
     try:
-        find = Task.select(Task.task_id, Task.task_name, Task.publish_id, Task.publish_time, Task.task_state).where(
-            Task.publish_id == creator, Task.task_state != 5).order_by(Task.task_id.desc())
+        if state == 'checking':
+            find = Task.select(Task.task_id, Task.task_name, Task.publish_id, Task.publish_time, Task.task_state).where(
+                Task.publish_id == creator, Task.task_state == 3).order_by(Task.task_id.desc())
+        elif state == 'selected':
+            find = Task.select(Task.task_id, Task.task_name, Task.publish_id, Task.publish_time, Task.task_state).where(
+                Task.publish_id == creator, ((Task.task_state == 2) | (Task.task_state == 1))).order_by(Task.task_id.desc())
+        elif state == 'published':
+            find = Task.select(Task.task_id, Task.task_name, Task.publish_id, Task.publish_time, Task.task_state).where(
+                Task.publish_id == creator, Task.task_state == 0).order_by(Task.task_id.desc())
+        elif state == 'terminated':
+            find = Task.select(Task.task_id, Task.task_name, Task.publish_id, Task.publish_time, Task.task_state).where(
+                Task.publish_id == creator, Task.task_state == 4).order_by(Task.task_id.desc())
+        else:
+            find = []
         index = 0
         list = []
         while index + start < len(find) and index < num:
@@ -127,31 +139,6 @@ def find_task_by_creator(creator, start, num):
         return Result(1, "find success", list, math.ceil(len(find) / num))
 
 
-# 寻找发布者发布的需要审核的任务
-def find_task_check(creator, start, num):
-    try:
-        find = Task.select(Task.task_id, Task.task_name, Task.publish_id, Task.publish_time).where(
-            Task.publish_id == creator, Task.task_state == 3).order_by(Task.task_id.desc())
-        index = 0
-        list = []
-        while index + start < len(find) and index < num:
-            user = User.get_username(find[index + start].publish_id)
-            list.append(
-                {
-                    'id': find[index + start].task_id,
-                    'creator': user,
-                    'creator_id': find[index + start].publish_id,
-                    'name': find[index + start].task_name,
-                    'date': find[index + start].publish_time.strftime("%Y-%m-%d %H:%M:%S")
-                }
-            )
-            index += 1
-    except:
-        return Result(0, "find failed", {}, 0)
-    else:
-        return Result(1, "find success", list, math.ceil(len(find) / num))
-
-
 # 寻找已完成任务(根据所给用户id去Relation表中查询已完成的任务）
 def find_task_completed(executor, start, num):
     try:

DAPlatform/views/task.py

@@ -20,9 +20,7 @@ def get_tasks():
         ret = Task.find_task_by_name(keyword, pagesize * (currentpage - 1), pagesize)
     elif creator:
         if state:
-            ret = Task.find_task_check(creator, pagesize * (currentpage - 1), pagesize)
-        else:
-            ret = Task.find_task_by_creator(creator, pagesize * (currentpage - 1), pagesize)
+            ret = Task.find_task_by_creator(creator, pagesize * (currentpage - 1), pagesize, state)
     elif executor:
         if state:
             ret = Task.find_task_completed(executor, pagesize * (currentpage - 1), pagesize)