diff --git a/services/plan_service.py b/services/plan_service.py index 20a7e651cb825cb8a9cce407291fe94807a4be3f..144f0c8f5ed6bf17ca0a3babd845564eb69eb972 100644 --- a/services/plan_service.py +++ b/services/plan_service.py @@ -10,6 +10,7 @@ from models.device_model import Device from models.job_model import FuncResult, PerfResult from models.plan_model import Plan, PlanReview from models.requirement_model import Requirement +from models.product_model import ProductPlan from models.task_model import Task, update_manual_task_status from services.const import ERROR_UN_EXISTED_PLAN, ERROR_NO_REQUIREMENT_PERMISSION, ERROR_UN_EXISTED_REQUIREMENT from services.tone_job_service import create_tone_job @@ -23,6 +24,8 @@ PLAN_KEY = 'plan_dict' async def get_plans(content=None, status=None): fields = [Plan.title, Plan.id, Plan.status] conditions = list() + plan_id_list = await ProductPlan.query_obj_all_by_fields(fields=[ProductPlan.plan_id]) + conditions.append(Plan.id.notin_([p['plan_id'] for p in plan_id_list])) if content: conditions.append(Plan.title.contains(content)) if status: