Merge branch 'master' of http://git.legu.cc/leguadmin/prs_server
This commit is contained in:
commit
d6e6740145
@ -107,6 +107,16 @@ def chkData(data):
|
|||||||
true_index = index
|
true_index = index
|
||||||
work_dict = work_list[true_index]
|
work_dict = work_list[true_index]
|
||||||
work_list = [work_dict]
|
work_list = [work_dict]
|
||||||
|
bast_index = 0
|
||||||
|
bast_time = 0
|
||||||
|
for index, i in enumerate(work_list):
|
||||||
|
time = i.get('time' '')
|
||||||
|
if time:
|
||||||
|
chk_time = int(time.split('-')[-1].split('/')[0])
|
||||||
|
if chk_time > bast_time:
|
||||||
|
bast_time = chk_time
|
||||||
|
bast_index = index
|
||||||
|
data['firm'] = work_list[bast_index]
|
||||||
else:
|
else:
|
||||||
work_list = []
|
work_list = []
|
||||||
res1['work_list'] = work_list
|
res1['work_list'] = work_list
|
||||||
@ -916,19 +926,21 @@ async def find_criterion(
|
|||||||
data[i] = int(df[i][0])
|
data[i] = int(df[i][0])
|
||||||
else:
|
else:
|
||||||
data[i] = df[i][0]
|
data[i] = df[i][0]
|
||||||
# if data['work_exp'] == 0:
|
|
||||||
# data['work_exp'] = '应届生'
|
|
||||||
# elif data['work_exp'] >= 1 and data['work_exp'] < 3:
|
|
||||||
# data['work_exp'] = '1-3年'
|
|
||||||
# elif data['work_exp'] >= 3 and data['work_exp'] < 5:
|
|
||||||
# data['work_exp'] = '1-3年'
|
|
||||||
# else:
|
|
||||||
# data['work_exp'] = '5年以上'
|
|
||||||
if data.get('work_list', []):
|
if data.get('work_list', []):
|
||||||
work_list = [json.loads(i) for i in data['work_list']]
|
work_list = [json.loads(i) for i in data['work_list']]
|
||||||
if isinstance(work_list[0], str):
|
if isinstance(work_list[0], str):
|
||||||
work_list = [eval(i) for i in work_list]
|
work_list = [eval(i) for i in work_list]
|
||||||
data['work_list'] = work_list
|
data['work_list'] = work_list
|
||||||
|
bast_index = 0
|
||||||
|
bast_time = 0
|
||||||
|
for index, i in enumerate(work_list):
|
||||||
|
time = i.get('time' '')
|
||||||
|
if time:
|
||||||
|
chk_time = int(time.split('-')[-1].split('/')[0])
|
||||||
|
if chk_time > bast_time:
|
||||||
|
bast_time = chk_time
|
||||||
|
bast_index = index
|
||||||
|
data['firm'] = work_list[bast_index]
|
||||||
if data.get('project_undergo', []):
|
if data.get('project_undergo', []):
|
||||||
project_undergo = [json.loads(i) for i in data['project_undergo']]
|
project_undergo = [json.loads(i) for i in data['project_undergo']]
|
||||||
if isinstance(project_undergo[0], str):
|
if isinstance(project_undergo[0], str):
|
||||||
|
Loading…
Reference in New Issue
Block a user