diff --git a/module/achievement/excel.py b/module/achievement/excel.py index 0a56133..000a51a 100644 --- a/module/achievement/excel.py +++ b/module/achievement/excel.py @@ -285,9 +285,14 @@ class ExcelReader: continue if index == 2: if len(self.n_evaluation_methods) == 6: - yield f"期末考核\n({self.n_evaluation_methods[5]})" + if self.n_evaluation_methods[5] == "试卷": + yield "期末考核\n(试卷)" + else: + yield "期末考核" + elif j[0] == "试卷": + yield "期末考核\n(试卷)" else: - yield f"期末考核\n({j[0]})" + yield "期末考核" else: yield f"{j[0]}考核" @@ -317,8 +322,9 @@ class ExcelReader: case 1: yield "\n".join([x for x in self.n_evaluation_methods[3:5] if x is not None]) case 2: - if (len(self.n_evaluation_methods) == 6 and self.n_evaluation_methods[5] != "试卷" or - len(self.n_evaluation_methods) == 5 and self.evaluation_stage[2][0] != "试卷"): + if len(self.n_evaluation_methods) == 6 and self.n_evaluation_methods[5] != "试卷": + yield self.n_evaluation_methods[5] + elif len(self.n_evaluation_methods) == 5 and self.evaluation_stage[2][0] != "试卷": yield self.evaluation_stage[2][0] else: # 中文数字到数字的映射