diff --git a/api/api_v1/endpoints/interview.py b/api/api_v1/endpoints/interview.py index c4cb48e..7200c44 100644 --- a/api/api_v1/endpoints/interview.py +++ b/api/api_v1/endpoints/interview.py @@ -102,8 +102,26 @@ def chkData(data): for index, i in enumerate(work_list): if index == 0: continue - if int(i['time'].split('-')[0].replace('.', '').replace('/', '')) > int( - work_list[true_index]['time'].split('-')[0].replace('.', '').replace('/', '')): + split_str1 = '' + split_str2 = '' + if '-' in i['time']: + split_str1 = '-' + if '-' in work_list[true_index]['time']: + split_str2 = '-' + if '–' in i['time']: + split_str1 = '–' + if '–' in work_list[true_index]['time']: + split_str2 = '–' + if '―' in i['time']: + split_str1 = '―' + if '―' in work_list[true_index]['time']: + split_str2 = '―' + if '—' in i['time']: + split_str1 = '—' + if '—' in work_list[true_index]['time']: + split_str2 = '—' + if int(i['time'].split(split_str1)[0].replace('.', '').replace('/', '')) > int( + work_list[true_index]['time'].split(split_str2)[0].replace('.', '').replace('/', '')): true_index = index work_dict = work_list[true_index] work_list = [work_dict] @@ -112,7 +130,16 @@ def chkData(data): for index, i in enumerate(work_list): time = i.get('time' '').replace('.', '/') if time: - if time.split('-')[-1].split('/')[0].strip().isdigit(): + split_str3 = '' + if '-' in time: + split_str3 = '-' + if '–' in time: + split_str3 = '–' + if '―' in time: + split_str3 = '―' + if '—' in time: + split_str3 = '—' + if time.split(split_str3)[-1].split('/')[0].strip().isdigit(): chk_time = int(time.split('-')[-1].split('/')[0]) else: chk_time = int(datetime.now().year) @@ -642,22 +669,17 @@ async def file_to_hw( whereStr = whereStr.strip() sql = f"select uid from HR.resumes where {whereStr}" is_in_data = await db.execute(sql) + exist = 0 if is_in_data: - return schemas.Msg(code=-9, msg='简历已存在', data=[]) - if not find_phone: - return schemas.Msg(code=-9, msg='电话号码不存在', data=[]) + exist = 1 + uid = is_in_data.values()[0]['uid'] + data_mode['file_url'] = url # os.rename(path_data + '/' + filename, path_data + '/' + find_phone + '.pdf') - res = obsClient.putFile('legu-cdn-source', 'hrms/' + find_phone + '.pdf', fn) + res = obsClient.putFile('legu-cdn-source', 'hrms/' + uid + '.pdf', fn) if res.status < 300: # 地址 url = res.body.objectUrl data_mode['file_url'] = url - sql = f"insert into HR.resumes(interview_name, interview_type, interview_sign, hope_money, feedback," \ - f" interview_round, event_time, uid, name, phone, job_name, hr_name, work_exp, interview_stage, owner_name," \ - f" education, work_undergo, project_undergo, work_list, school, at_school, specialty, specialty_do, " \ - f"mmended_state, mail, account, id_card, gender, age, gam, interview_state, counts, nation, come_time," \ - f" review, upgrade, now_money, men_state, teacher_state, teacher_back, offer_state, offer_exam_state," \ - f" notice_state, pass_why, pass_text, now_address,language,remembrance, file_url, hr_manner) values" res_data = { 'data': data, 'file_url': url, @@ -667,6 +689,14 @@ async def file_to_hw( 'language_list': language, 'remembrance_list': remembrance } + + sql = f"insert into HR.resumes(interview_name, interview_type, interview_sign, hope_money, feedback," \ + f" interview_round, event_time, uid, name, phone, job_name, hr_name, work_exp, interview_stage, owner_name," \ + f" education, work_undergo, project_undergo, work_list, school, at_school, specialty, specialty_do, " \ + f"mmended_state, mail, account, id_card, gender, age, gam, interview_state, counts, nation, come_time," \ + f" review, upgrade, now_money, men_state, teacher_state, teacher_back, offer_state, offer_exam_state," \ + f" notice_state, pass_why, pass_text, now_address,language,remembrance, file_url, hr_manner) values" + await db.execute_dict(sql, [data_mode]) return schemas.Msg(code=0, msg='ok', data=res_data) else: @@ -1076,7 +1106,6 @@ async def resume_affix( return schemas.Msg(code=400, msg='上传华为云失败', data=None) - @router.post("/updata_entry") async def updata_entry( request: Request,