修改题号位数引起的一个排除使用记录时可能会发生的bug
This commit is contained in:
parent
0c4391efcd
commit
7142d5adeb
|
|
@ -2245,5 +2245,11 @@ def usagelistdifference(lista,listb): #比较两个usage数组的最大差别(
|
||||||
return maxdiff
|
return maxdiff
|
||||||
|
|
||||||
|
|
||||||
|
def RefineExclude(excludejson): #将excludejson的key变为6位题号
|
||||||
|
newjson = {}
|
||||||
|
for key in excludejson:
|
||||||
|
newjson[key.zfill(6)] = excludejson[key]
|
||||||
|
return newjson
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
print("数据库工具, import用.")
|
print("数据库工具, import用.")
|
||||||
|
|
@ -143,7 +143,7 @@ class MyWindow(QWidget,Ui_Form):
|
||||||
validcols,marks = generateColIndexandMarks(statsfilepathlist,self.statsfilename,paperinfo)
|
validcols,marks = generateColIndexandMarks(statsfilepathlist,self.statsfilename,paperinfo)
|
||||||
dfcurrent = pd.read_excel(os.path.join(statsfilepathlist[0],self.statsfilename))
|
dfcurrent = pd.read_excel(os.path.join(statsfilepathlist[0],self.statsfilename))
|
||||||
correspondence_dict = generateIDtoUsageCorrespondence(idlist,validcols,dfcurrent.iloc[1,validcols])
|
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开始的使用记录文本
|
return output #返回由usages开始的使用记录文本
|
||||||
except:
|
except:
|
||||||
return 1 #无法生成就返回1
|
return 1 #无法生成就返回1
|
||||||
|
|
|
||||||
Reference in New Issue