查询兼容
This commit is contained in:
parent
105394f387
commit
60c45ce4a7
@ -91,8 +91,8 @@ def chkData(data):
|
|||||||
if 'pass_why' in res1:
|
if 'pass_why' in res1:
|
||||||
key16 = res1['pass_why']
|
key16 = res1['pass_why']
|
||||||
res1['pass_why'] = pass_why_dict.get(key16, '')
|
res1['pass_why'] = pass_why_dict.get(key16, '')
|
||||||
if 'work_list' in i:
|
if 'work_list' in res1:
|
||||||
work_list = i['work_list']
|
work_list = res1['work_list']
|
||||||
if work_list:
|
if work_list:
|
||||||
work_list = [json.loads(i) for i in work_list]
|
work_list = [json.loads(i) for i in work_list]
|
||||||
if isinstance(work_list[0], str):
|
if isinstance(work_list[0], str):
|
||||||
@ -110,8 +110,8 @@ def chkData(data):
|
|||||||
else:
|
else:
|
||||||
work_list = []
|
work_list = []
|
||||||
res1['work_list'] = work_list
|
res1['work_list'] = work_list
|
||||||
if 'project_undergo' in i:
|
if 'project_undergo' in res1:
|
||||||
project_undergo = i['project_undergo']
|
project_undergo = res1['project_undergo']
|
||||||
if project_undergo:
|
if project_undergo:
|
||||||
project_undergo = [json.loads(i) for i in project_undergo]
|
project_undergo = [json.loads(i) for i in project_undergo]
|
||||||
if isinstance(project_undergo[0], str):
|
if isinstance(project_undergo[0], str):
|
||||||
@ -119,8 +119,8 @@ def chkData(data):
|
|||||||
else:
|
else:
|
||||||
project_undergo = []
|
project_undergo = []
|
||||||
res1['project_undergo'] = project_undergo
|
res1['project_undergo'] = project_undergo
|
||||||
if 'language' in i:
|
if 'language' in res1:
|
||||||
language = i['language']
|
language = res1['language']
|
||||||
if language:
|
if language:
|
||||||
language = [json.loads(i) for i in language]
|
language = [json.loads(i) for i in language]
|
||||||
if isinstance(language[0], str):
|
if isinstance(language[0], str):
|
||||||
@ -128,8 +128,8 @@ def chkData(data):
|
|||||||
else:
|
else:
|
||||||
language = []
|
language = []
|
||||||
res1['language'] = language
|
res1['language'] = language
|
||||||
if 'remembrance' in i:
|
if 'remembrance' in res1:
|
||||||
remembrance = i['remembrance']
|
remembrance = res1['remembrance']
|
||||||
if remembrance:
|
if remembrance:
|
||||||
remembrance = [json.loads(i) for i in remembrance]
|
remembrance = [json.loads(i) for i in remembrance]
|
||||||
if isinstance(remembrance[0], str):
|
if isinstance(remembrance[0], str):
|
||||||
|
@ -296,6 +296,9 @@ class InterviewDo:
|
|||||||
def find_interview_sql(self):
|
def find_interview_sql(self):
|
||||||
whereStr = ''
|
whereStr = ''
|
||||||
findStr = ''
|
findStr = ''
|
||||||
|
if not self.find_column:
|
||||||
|
findStr = '*'
|
||||||
|
else:
|
||||||
for fstr in self.find_column:
|
for fstr in self.find_column:
|
||||||
findStr += fstr + ', '
|
findStr += fstr + ', '
|
||||||
for key, value in self.where.items():
|
for key, value in self.where.items():
|
||||||
@ -305,14 +308,16 @@ class InterviewDo:
|
|||||||
values = value.split(',')
|
values = value.split(',')
|
||||||
for index, i in enumerate(values):
|
for index, i in enumerate(values):
|
||||||
if index > 0:
|
if index > 0:
|
||||||
whereStr += 'or ' + str(key) + 'like %' + "'" + i + "'" + '% '
|
whereStr += 'or ' + str(key) + ' like ' + "'%" + i + "%'" + ' '
|
||||||
else:
|
else:
|
||||||
whereStr += str(key) + 'like %' + "'" + i + "'" + '% '
|
whereStr += str(key) + ' like ' + "'%" + i + "%'" + ' '
|
||||||
continue
|
continue
|
||||||
# 单个条件
|
# 单个条件
|
||||||
whereStr += str(key) + 'like %' + "'" + value + "'" + '% '
|
whereStr += str(key) + ' like ' + "'%" + value + "%'" + ' '
|
||||||
continue
|
continue
|
||||||
if isinstance(value, str):
|
if isinstance(value, str):
|
||||||
|
if not value.strip():
|
||||||
|
continue
|
||||||
whereStr += str(key) + ' = ' + "'" + value + "'" + ' '
|
whereStr += str(key) + ' = ' + "'" + value + "'" + ' '
|
||||||
continue
|
continue
|
||||||
whereStr += str(key) + ' = ' + str(value) + ' '
|
whereStr += str(key) + ' = ' + str(value) + ' '
|
||||||
|
Loading…
Reference in New Issue
Block a user