diff --git a/工具v2/database_tools.py b/工具v2/database_tools.py index 167e2d3c..b6a9531c 100644 --- a/工具v2/database_tools.py +++ b/工具v2/database_tools.py @@ -2245,5 +2245,11 @@ def usagelistdifference(lista,listb): #比较两个usage数组的最大差别( return maxdiff +def RefineExclude(excludejson): #将excludejson的key变为6位题号 + newjson = {} + for key in excludejson: + newjson[key.zfill(6)] = excludejson[key] + return newjson + if __name__ == "__main__": print("数据库工具, import用.") \ No newline at end of file diff --git a/工具v2/获取小闲平台使用数据new.py b/工具v2/获取小闲平台使用数据new.py index 43611cec..ea60be8e 100644 --- a/工具v2/获取小闲平台使用数据new.py +++ b/工具v2/获取小闲平台使用数据new.py @@ -143,7 +143,7 @@ class MyWindow(QWidget,Ui_Form): validcols,marks = generateColIndexandMarks(statsfilepathlist,self.statsfilename,paperinfo) dfcurrent = pd.read_excel(os.path.join(statsfilepathlist[0],self.statsfilename)) correspondence_dict = generateIDtoUsageCorrespondence(idlist,validcols,dfcurrent.iloc[1,validcols]) - output = CalculateUsages(statsfilepathlist,self.statsfilename,gradename,threshold,marks,correspondence_dict,validcols,date,exclude=excludejson) + output = CalculateUsages(statsfilepathlist,self.statsfilename,gradename,threshold,marks,correspondence_dict,validcols,date,exclude=RefineExclude(excludejson)) return output #返回由usages开始的使用记录文本 except: return 1 #无法生成就返回1