v0.1.1

apps/createDocument/controllers/dg.py

@@ -1,8 +1,6 @@
 from datetime import datetime
 from ninja.errors import HttpError
 from ninja_extra import ControllerBase, api_controller, route
-from ninja_extra.permissions import IsAuthenticated
-from ninja_jwt.authentication import JWTAuth
 from django.db import transaction
 from django.db.models import Q
 from docxtpl import DocxTemplate
@@ -14,7 +12,6 @@ from apps.dict.models import Dict
 # 导入工具函数
 from utils.util import get_str_dict, get_list_dict, get_testType, get_ident, get_str_abbr
 from utils.chapter_tools.csx_chapter import create_csx_chapter_dict
-from utils.util import MyHTMLParser_p
 from django.shortcuts import get_object_or_404
 from django.forms.models import model_to_dict
 from apps.createDocument.extensions.util import create_dg_docx
@@ -25,6 +22,8 @@ from utils.path_utils import project_path
 from apps.createSeiTaiDocument.extensions.logger import GenerateLogger
 # 导入mixins-处理文档片段
 from apps.createDocument.extensions.mixins import FragementToolsMixin
+# 导入工具
+from apps.createDocument.extensions.tools import demand_sort_by_designKey
 
 # @api_controller("/generate", tags=['生成大纲文档'], auth=JWTAuth(), permissions=[IsAuthenticated])
 @api_controller("/generate", tags=['生成大纲文档'])
@@ -47,10 +46,12 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
 
         # 查出第一轮所有testdemand
         project_round_one = project_qs.pField.filter(key=0).first()
-        testDemand_qs = project_round_one.rtField.all()
+        testDemand_qs = project_round_one.rtField.all().select_related('design')
+        # 按照自己key排序，这样可以按照design的key排序
+        sorted_demand_qs = sorted(testDemand_qs, key=demand_sort_by_designKey)
 
         # 遍历第一轮测试项：默认是ID排序
-        for single_qs in testDemand_qs:
+        for single_qs in sorted_demand_qs:
             type_index = type_number_list.index(int(single_qs.testType))
             # 先查询其testDemandContent信息
             content_list = []
@@ -665,7 +666,6 @@ class GenerateControllerDG(ControllerBase, FragementToolsMixin):
                 test_items = design.dtField.all()
                 # 连接两个QuerySet，默认去重
                 test_items = test_items.union(design.odField.all())
-                print('ok:', test_items)
                 for test_item in test_items:
                     reveal_ident = "_".join(
                         ["XQ", get_testType(test_item.testType, "testType"), test_item.ident])

apps/createDocument/controllers/hsm.py

@@ -1,23 +1,17 @@
-import base64
-import io
 from pathlib import Path
 from copy import deepcopy
 from typing import Union
 from ninja_extra import api_controller, ControllerBase, route
-from ninja_extra.permissions import IsAuthenticated
-from ninja_jwt.authentication import JWTAuth
-from ninja.errors import HttpError
 from django.db import transaction
 from django.shortcuts import get_object_or_404
 from django.db.models import QuerySet, Q
-from docxtpl import DocxTemplate, RichText, InlineImage
-from docx.shared import Mm
+from docxtpl import DocxTemplate
 from docx import Document
 # 导入模型
 from apps.project.models import Project, Round, Dut
-from apps.dict.models import Dict, DictItem
+from apps.dict.models import Dict
 # 导入项目工具
-from utils.util import get_list_dict, get_str_dict, MyHTMLParser, get_ident, get_case_ident, get_testType
+from utils.util import get_list_dict, get_str_dict, get_ident, get_case_ident, get_testType
 from utils.chapter_tools.csx_chapter import create_csx_chapter_dict
 from utils.chen_response import ChenResponse
 from apps.createDocument.extensions import util
@@ -27,6 +21,8 @@ from apps.createDocument.extensions.parse_rich_text import RichParser
 from apps.createDocument.extensions.documentTime import DocTime
 # 导入生成日志记录模块
 from apps.createSeiTaiDocument.extensions.logger import GenerateLogger
+# 导入排序
+from apps.createDocument.extensions.tools import demand_sort_by_designKey
 
 chinese_round_name: list = ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十']
 
@@ -266,9 +262,7 @@ class GenerateControllerHSM(ControllerBase):
     @route.get("/create/hdemand", url_name="create-hdemand")
     @transaction.atomic
     def create_hdemand(self, id: int):
-        """
-            生成非第一轮的多个测试需求
-        """
+        """生成非第一轮的多个测试需求"""
         project_path_str = project_path(id)
         tpl_path = Path.cwd() / 'media' / project_path_str / 'form_template/hsm' / '回归测试需求.docx'
         doc = DocxTemplate(tpl_path)
@@ -284,9 +278,13 @@ class GenerateControllerHSM(ControllerBase):
             test_type_len = Dict.objects.get(code='testType').dictItem.count()
             type_number_list = [i for i in range(1, test_type_len + 1)]
             list_list = [[] for j in range(1, test_type_len + 1)]
+
             # 获得本轮次所有testDemand
-            testDemand_qs = hround.rtField.all()
-            for demand in testDemand_qs:
+            testDemand_qs = hround.rtField.all().select_related('design')
+            # 根据自己key排序
+            sorted_demand_qs = sorted(testDemand_qs, key=demand_sort_by_designKey)
+
+            for demand in sorted_demand_qs:
                 type_index = type_number_list.index(int(demand.testType))
                 content_list = []
                 for (index, content) in enumerate(demand.testQField.all()):
@@ -324,7 +322,7 @@ class GenerateControllerHSM(ControllerBase):
                     "doc_list": doc_list,
                     "design_description": parser.get_final_list(doc),
                     "test_demand_content": content_list,
-                    "testMethod": testmethod_str,
+                    "testMethod": testmethod_str.strip(),
                     "adequacy": demand.adequacy.replace("\n", "\a"),
                     "testDesciption": demand.testDesciption.replace("\n", "\a")  # 测试项描述
                 }

apps/createDocument/extensions/tools.py

@@ -0,0 +1,9 @@
+from apps.project.models import TestDemand
+
+def demand_sort_by_designKey(demand_obj: TestDemand) -> tuple[int, ...]:
+    """仅限于测试项排序函数，传入sorted函数的key里面"""
+    parts = demand_obj.key.split('-')
+    sort_tuple = tuple(int(part) for part in parts)
+    return sort_tuple
+
+__all__ = ['demand_sort_by_designKey']