From c548e4a2c22aa04e47cf1c16bf0456fbfdbb3f01 Mon Sep 17 00:00:00 2001 From: "weiye.wang" Date: Wed, 27 Mar 2024 22:46:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=AD=A3=E7=A1=AE=E7=8E=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A2=98=E5=8F=B7=E5=8A=9F=E8=83=BD=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=B9=B4=E7=BA=A7=E6=94=B9=E4=B8=BA=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F(=E6=8B=93?= =?UTF-8?q?=E5=B1=95=E4=BA=86=E5=8A=9F=E8=83=BD,=20=E5=8E=9F=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E5=B9=B4=E7=BA=A7=E5=8A=9F=E8=83=BD=E4=BE=9D=E7=84=B6?= =?UTF-8?q?=E4=BF=9D=E7=95=99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 工具v2/database_tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/工具v2/database_tools.py b/工具v2/database_tools.py index e71ff668..7368403c 100644 --- a/工具v2/database_tools.py +++ b/工具v2/database_tools.py @@ -2253,11 +2253,11 @@ def RefineExclude(excludejson): #将excludejson的key变为6位题号 return newjson -def ChooseIDsByUsageInterval(startdate,enddate,interval,grade,prodict): #返回根据条件选出的题号字典及对应小题, 需要留意的记录长度不一的题号, 以及所有使用过的题号 +def ChooseIDsByUsageInterval(startdate,enddate,interval,classregex,prodict): #返回根据条件选出的题号字典及对应小题, 需要留意的记录长度不一的题号, 以及所有使用过的题号 used_problems = [] for id in prodict: currentproblem = prodict[id] - currentusages = [parseUsage(u) for u in currentproblem["usages"] if startdate <= parseUsage(u)["date"] <= enddate and grade+"届" in parseUsage(u)["classid"]] + currentusages = [parseUsage(u) for u in currentproblem["usages"] if startdate <= parseUsage(u)["date"] <= enddate and re.findall(classregex,parseUsage(u)["classid"])!=[]] if not currentusages == []: used_problems.append((id,currentusages)) cautionids = [] #使用记录长度不一的题目id