diff --git a/工具v2/database_tools.py b/工具v2/database_tools.py index a7445fd1..f1e3a366 100644 --- a/工具v2/database_tools.py +++ b/工具v2/database_tools.py @@ -674,12 +674,14 @@ def AppendUsageData2024(prodict,field_id_and_content): print(f"######班级 {usage['classid']} 在题号为 {id} 的题目处已有非常类似的使用记录, 不作记录") importflag = False break - elif usage["classid"] == oldusage["classid"]: - print(f"!!!!!!班级 {usage['classid']} 在题号为 {id} 的题目处已有使用记录, 在pending list中记录") - oldinfo = [v for v in prodict[id][field] if usage['classid'] in v] - pending_list = pending_list + [(id,line,oldinfo)] - importflag = False - break + if importflag: + for u in oldusages: + if usage["classid"] == oldusage["classid"]: + print(f"!!!!!!班级 {usage['classid']} 在题号为 {id} 的题目处已有使用记录, 在pending list中记录") + oldinfo = [v for v in prodict[id][field] if usage['classid'] in v] + pending_list = pending_list + [(id,line,oldinfo)] + importflag = False + break if importflag: prodict[id][field].append(line) print(f"已于 {id} 的 {field} 字段执行添加, 内容为 {line}") @@ -715,7 +717,7 @@ def ImportMetadata(prodict,objdict,fieldsdict,metadatafilepath,pendingdatafilepa elif method == "objappend": feedback = AppendObjData(prodict,objdict,item) elif method == "usageappend": - feedback = AppendUsageData(prodict,item) + feedback = AppendUsageData2024(prodict,item) outputstring += feedback[3] elif method == "fixed": print("字段 %s 不可按此方式修改"%field)