Browse Source

测试任务增加'类型'字段

bigcat 2 years ago
parent
commit
9d9b5299b7
3 changed files with 8 additions and 2 deletions
  1. 1 0
      apps/plan/models.py
  2. 4 2
      apps/plan/views/planlistview.py
  3. 3 0
      apps/plan/views/planview.py

+ 1 - 0
apps/plan/models.py

@@ -16,6 +16,7 @@ class TestPlan(models.Model):
     title = models.CharField(max_length=30, verbose_name='测试计划标题')
     software = models.ForeignKey(Software, on_delete=models.CASCADE, verbose_name='测试软件')
     version = models.CharField(max_length=20, verbose_name='软件版本')
+    type = models.CharField(max_length=20,verbose_name='测试任务类型')
     creator = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, verbose_name='测试计划执行者')
     state = models.IntegerField(verbose_name='测试计划执行状态')
     description = models.TextField(verbose_name='测试计划描述')

+ 4 - 2
apps/plan/views/planlistview.py

@@ -33,7 +33,7 @@ class PlanListView(APIView):
         description = request.POST.get('description')
         files = request.FILES.getlist('files')
         creator_id = request.POST.get('creator')
-
+        type = request.POST.get('type')
         # step1:判断所属软件及版本是否存在
         software = Software.objects.filter(id=software_id, delete=False)
         if not software:
@@ -99,7 +99,7 @@ class PlanListView(APIView):
         try:
             plan = TestPlan.objects.create(id=id_plan, title=title, description=description, state='0',
                                            creator=creator, software=software, version=software_version.number,
-                                           statement_file=fids,
+                                           statement_file=fids, type=type,
                                            create_time=create_time, update_time=update_time)
         except:
             logger.error("测试计划写入数据库失败")
@@ -113,6 +113,7 @@ class PlanListView(APIView):
             'version': version_number,
             'creator_id': creator.id,
             'creator': creator.username,
+            'type': type,
             'id': plan.id,
             'title': title,
             'description': description,
@@ -156,6 +157,7 @@ class PlanListView(APIView):
                 'software_id': plan.software.id,
                 'software_name': plan.software.name,
                 'version': plan.version,
+                'type': plan.type,
                 'creator_id': plan.creator.id,
                 'creator': plan.creator.username,
                 'id': plan.id,

+ 3 - 0
apps/plan/views/planview.py

@@ -57,6 +57,7 @@ class PlanView(APIView):
             'software_id': plan.software.id,
             'software_name': plan.software.name,
             'version': plan.version,
+            'type': plan.type,
             'creator_id': plan.creator.id,
             'creator': plan.creator.username,
             'id': plan.id,
@@ -102,6 +103,7 @@ class PlanEdit(APIView):
     def post(request, plan_id, *args, **kwargs):
         title = request.POST.get('title')
         state = request.POST.get('state')
+        type = request.POST.get('type')
         description = request.POST.get('description')
         files = request.FILES.getlist('files')
 
@@ -113,6 +115,7 @@ class PlanEdit(APIView):
 
         plan.title = title
         plan.state = state
+        plan.type = type
         plan.description = description
 
         fids = ''