修正达成度问题
This commit is contained in:
@@ -285,9 +285,14 @@ class ExcelReader:
|
|||||||
continue
|
continue
|
||||||
if index == 2:
|
if index == 2:
|
||||||
if len(self.n_evaluation_methods) == 6:
|
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:
|
else:
|
||||||
yield f"期末考核\n({j[0]})"
|
yield "期末考核"
|
||||||
else:
|
else:
|
||||||
yield f"{j[0]}考核"
|
yield f"{j[0]}考核"
|
||||||
|
|
||||||
@@ -317,8 +322,9 @@ class ExcelReader:
|
|||||||
case 1:
|
case 1:
|
||||||
yield "\n".join([x for x in self.n_evaluation_methods[3:5] if x is not None])
|
yield "\n".join([x for x in self.n_evaluation_methods[3:5] if x is not None])
|
||||||
case 2:
|
case 2:
|
||||||
if (len(self.n_evaluation_methods) == 6 and self.n_evaluation_methods[5] != "试卷" or
|
if len(self.n_evaluation_methods) == 6 and self.n_evaluation_methods[5] != "试卷":
|
||||||
len(self.n_evaluation_methods) == 5 and self.evaluation_stage[2][0] != "试卷"):
|
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]
|
yield self.evaluation_stage[2][0]
|
||||||
else:
|
else:
|
||||||
# 中文数字到数字的映射
|
# 中文数字到数字的映射
|
||||||
|
|||||||
Reference in New Issue
Block a user