修复bug及过滤非自项目测试用例

controller/Tool.py

@@ -98,6 +98,8 @@ def reportinfo():
     story=list(filter(lambda x:type_[x["typeId"]]=="Story",iterationitems))
     bug=list(filter(lambda x:type_[x["typeId"]]=="BUG",iterationitems))
     testcase=list(filter(lambda x:type_[x["typeId"]]=="测试用例",all_))
+    keylist=list(map(lambda x:x.get("key"),testcase))
+    print(keylist)
     for i in story:
         i["case"]=[]
         i["childrenTask"]=[i.get("key")]
@@ -131,17 +133,17 @@ def reportinfo():
                 for each in j.get("sections"):
                     if each["label"]=="测试用例":
                         soup=BeautifulSoup(each["html"],"html.parser")
-                        i["case"]=[i.next_element for i in soup.select('tr>td[align="left"]>span>a')]
+                        i["case"]=[i.next_element for i in soup.select('tr>td[align="left"]>span>a') if i.next_element in keylist]
     for i in bug:
         info=requests.request("get",jiraAddress+"/rest/api/latest/issue/"+i.get("key"),headers=headers).json()
         m=requests.request("get",jiraAddress+"/secure/AjaxIssueEditAction!default.jspa?decorator=none&issueId="+str(i.get("id")),headers=headers).json()
         count=0
         for j in m.get("fields"):
             if j.get("label")=="严重程度":
-                i["Severity"]=info["fields"][j.get("id")].get("value")
+                i["Severity"]=info["fields"][j.get("id")] and info["fields"][j.get("id")].get("value") or ""
                 count+=1
             if j.get("label")=="BUG修复者":
-                i["ascription"]=info["fields"][j.get("id")] and info["fields"][j.get("id")].get("displayName") or i["assigneeName"] 
+                i["ascription"]=info["fields"][j.get("id")] and info["fields"][j.get("id")].get("displayName") or i.get("assigneeName")
                 count+=1
             if count>=2:
                 break