修复：测试记录序号、测评报告统计、富文本渲染word字符问题

apps/createDocument/extensions/content_result_tool.py

@@ -1,7 +1,9 @@
-from apps.project.models import Project
+from apps.project.models import Project, Round, InfluenceArea
+from docxtpl import DocxTemplate
 from utils.util import *
 from utils.chen_response import ChenResponse
 from django.db.models import Q
+from apps.createDocument.extensions.parse_rich_text import RichParser
 
 def create_round_context(project_obj: Project, round_id: str):
     """根据轮次，生成测评报告中的测评结果"""
@@ -77,4 +79,37 @@ def create_round_context(project_obj: Project, round_id: str):
         'r2_dynamic_str': r2_dynamic_str,
         'round_id': round_chinese[round_id],
     }
-    return context
+    return context, round_obj
+
+# ~~~影响域分析：内容返回influence的render_list~~~
+def create_influence_context(doc: DocxTemplate, round_obj: Round, project_obj: Project) -> None | list:
+    area_qs = InfluenceArea.objects.filter(round=round_obj)
+    item_render_list = []
+    ## 如果存在则查询items
+    if area_qs.exists():
+        area_obj = area_qs.first()
+        items_qs = area_obj.influence_items.all()
+        if items_qs.exists():
+            index = 1
+            for item in items_qs:
+                # 1.处理关联case - 找第一轮cases
+                case_str_list = []
+                for case in project_obj.pcField.filter(key__in=item.effect_cases):
+                    case_ident_index = str(int(case.key.split("-")[-1]) + 1).zfill(3)
+                    case_str_list.append("_".join(["YL", get_str_abbr(case.test.testType, "testType"), case.ident, case_ident_index]))
+                # 2.处理富文本框
+                parser = RichParser(item.change_des)
+                item_dict = {
+                    "change_type": item.change_type,
+                    "change_influ": item.change_influ,
+                    "case_str_list": case_str_list,
+                    "change_des": parser.get_final_list(doc, img_size=40, height=30),  # 富文本未处理
+                    "index": str(index),
+                }
+                index = index + 1
+                item_render_list.append(item_dict)
+
+    if len(item_render_list) > 0:
+        return item_render_list
+    else:
+        return None

apps/createDocument/extensions/parse_rich_text.py

@@ -22,6 +22,8 @@ class RichParser:
         # 最终的解析后的列表
         self.data_list = []
         self.line_parse()
+        # 匹配“表1-3”或“表1”等字符的正则
+        self.biao_pattern = re.compile(r"表\d+(?:-\d+)?")
 
     # 1.函数：将self.bs.contents去掉\n，获取每行数据
     def remove_n_in_contents(self):
@@ -127,6 +129,13 @@ class RichParser:
         for oneline in self.data_list:
             if isinstance(oneline, list) or oneline.startswith("data:image/png;base64"):
                 continue
-            else:
-                final_list.append(oneline)
+            cleaned_line = oneline
+            cleaned_line = re.sub(r'\s+', '', cleaned_line)
+            cleaned_line = cleaned_line.replace(')', '）')
+            cleaned_line = cleaned_line.strip()
+            # 去掉以“表3”的行
+            if self.biao_pattern.search(cleaned_line):
+                continue
+            if cleaned_line:
+                final_list.append(cleaned_line)
         return final_list

apps/createDocument/extensions/util.py

@@ -95,3 +95,4 @@ def delete_dir_files(path: Path) -> Any:
         for file in path.iterdir():
             if file.is_file():
                 file.unlink()
+