修复无法按状态、类型查询用例集的问题

This commit is contained in:
jerrylizilong 2019-03-27 11:08:36 +08:00
parent b370eb40fb
commit aba4726be8
1 changed files with 22 additions and 13 deletions

View File

@ -45,24 +45,33 @@ class test_suite_manage:
log.log().logger.info(result)
return result
def show_test_suites(self,conditionList, valueList, fieldlist,rows):
fieldlist=[]
if len(fieldlist)==0:
fieldlist = ['id', 'name', 'status', 'run_type','description','batchId']
def show_test_suites(self, conditionList, valueList, fieldlist, rows):
fieldlist = []
if len(fieldlist) == 0:
fieldlist = ['id', 'name', 'status', 'run_type', 'description', 'batchId']
search_value = fieldlist[0]
log.log().logger.info(fieldlist)
for i in range(1,len(fieldlist)):
search_value = search_value + ','+fieldlist[i]
condition = ''
for i in range(1, len(fieldlist)):
search_value = search_value + ',' + fieldlist[i]
condition = 'isDeleted = 0 '
for i in range(len(conditionList)):
if i == 0:
condition += str(conditionList[i]) +' like "%'+str(valueList[i])+'%"'
else:
condition += ' and '+str(conditionList[i]) +' like "%'+str(valueList[i])+'%"'
if len(valueList[i]):
if conditionList[i] == 'run_type':
if valueList[i] == 'Chrome':
valueList[i] = 2
elif valueList[i] == 'Android':
valueList[i] = 0
elif valueList[i] == 'iOS':
valueList[i] = 1
if conditionList[i] in ('id', 'status', 'run_type'):
condition += ' and ' + str(conditionList[i]) + ' = "' + str(valueList[i]) + '"'
else:
condition += ' and ' + str(conditionList[i]) + ' like "%' + str(valueList[i]) + '%"'
results = []
sql = 'select ' + str(search_value) + ' from test_suite where ' + str(condition) + ' and isDeleted = 0 order by id desc limit '+ str(rows)+';'
sql = 'select ' + str(search_value) + ' from test_suite where ' + str(
condition) + ' order by id desc limit ' + str(rows) + ';'
cases = useDB.useDB().search(sql)
log.log().logger.info('cases : %s '%cases)
log.log().logger.info('cases : %s ' % cases)
for i in range(len(cases)):
result = {}
result['id'] = cases[i][0]