From 089e0493001e2acfced5ea195ed91062bf50fa95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80=C3=AE=C3=97=C3=9A=C3=95=C3=B1?= Date: Mon, 19 Sep 2022 14:39:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api_v1/endpoints/forms.py | 6 ++++++ api/api_v1/endpoints/interview.py | 36 ++++++++++++++++--------------- crud/crud_interview_record.py | 6 +++--- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/api/api_v1/endpoints/forms.py b/api/api_v1/endpoints/forms.py index 273b649..34d00b2 100644 --- a/api/api_v1/endpoints/forms.py +++ b/api/api_v1/endpoints/forms.py @@ -857,6 +857,9 @@ async def every_stage_form( res_data = [] for k, v in res_msg.items(): + start_time = v.get('start_time', '') + if start_time: + v['start_time'] = start_time.split(' ')[0] res_value = deepcopy(v) res_data.append(res_value) level_list = { @@ -1150,6 +1153,9 @@ async def stage_success_form( }) res_data1 = [] for k, v in res_msg.items(): + start_time = v.get('start_time', '') + if start_time: + v['start_time'] = start_time.split(' ')[0] res_value = deepcopy(v) res_data1.append(res_value) level_list = { diff --git a/api/api_v1/endpoints/interview.py b/api/api_v1/endpoints/interview.py index b090065..bdc698c 100644 --- a/api/api_v1/endpoints/interview.py +++ b/api/api_v1/endpoints/interview.py @@ -1967,22 +1967,23 @@ async def add_interviewee( find_sql = f""" select uid,name,interview_name,hr_name,star_time,interview_sign,job_id,job_names,mail from HR.resumes where uid = '{data_in.uid}' """ - df = await ckdb.query_dataframe(find_sql) + # df = await ckdb.query_dataframe(find_sql) + df1 = await ckdb.execute(find_sql) + user_data = df1[0] # 存份面试数据到mongodb now_time = str(datetime.now()).split('.')[0] - await crud.interview_record.insert_record(db, schemas.interview_record(uid=df['uid'][0], # 唯一id - name=df['name'][0], # 求职者姓名 - interview_name=df['interview_name'][0], - # 面试官姓名 - hr_name=df['hr_name'][0], # hr姓名 - star_time=df['star_time'][0], # 开始面试时间 - interview_sign=0, # 签到状态 - job_id=df['job_id'][0], # 我们自己招聘的职位id - job_names=df['job_names'][0], # 我们自己招聘的职位名 - times=now_time, # 创建数据日期 - read_status=0, # 读取状态 - type='interview' # 记录的类型 - )) + await crud.interview_record.insert_record(db, {'uid': user_data['uid'], # 唯一id + 'name': user_data['name'], # 求职者姓名 + 'interview_name': user_data['interview_name'], # 面试官姓名 + 'hr_name': user_data['hr_name'], # hr姓名 + 'star_time': user_data['star_time'], # 开始面试时间 + 'interview_sign': 0, # 签到状态 + 'job_id': user_data['job_id'], # 我们自己招聘的职位id + 'job_names': user_data['job_names'], # 我们自己招聘的职位名 + 'times': now_time, # 创建数据日期 + 'read_status': 0, # 读取状态 + 'type': 'interview' # 记录的类型 + }) return schemas.Msg(code=200, msg='ok', data='') @@ -2295,7 +2296,7 @@ async def interview_teacher( return schemas.Msg(code=200, msg='ok', data=data) -@router.get("/record") +@router.post("/record") async def hint( request: Request, data_in: schemas.record, @@ -2303,9 +2304,10 @@ async def hint( current_user: schemas.UserDB = Depends(deps.get_current_user) ) -> schemas.Msg: """个人面试记录""" - res=[] + res = [] interview = await crud.interview_record.all_fields(db, {'uid': data_in.uid}) for i in interview: + i.pop('_id') res.append(i) data = sorted(res, key=operator.itemgetter('times')) - return schemas.Msg(code=200, msg='ok', data=data) \ No newline at end of file + return schemas.Msg(code=200, msg='ok', data=data) diff --git a/crud/crud_interview_record.py b/crud/crud_interview_record.py index 16aa74c..2a848b2 100644 --- a/crud/crud_interview_record.py +++ b/crud/crud_interview_record.py @@ -19,7 +19,7 @@ class CRUDInterview(CRUDBase): # 获取对应条件的数据 async def all_fields(self, db: AsyncIOMotorDatabase, where): - return await self.find_many(db, {where}) + return await self.find_many(db, where) # 修改面试读取状态 async def up_interview(self, db: AsyncIOMotorDatabase, data_in: schemas.Up_hint): @@ -47,8 +47,8 @@ class CRUDInterview(CRUDBase): # 插入一条新的面试数据数据 async def insert_record(self, db: AsyncIOMotorDatabase, data_in: schemas.interview_record): - data_ins = schemas.interview_records(**data_in.dict(), _id=uuid.uuid1().hex) - await self.insert_one(db, data_ins.dict(by_alias=True)) + # data_ins = schemas.interview_records(data_in, _id=uuid.uuid1().hex) + await self.insert_one(db, data_in) interview_record = CRUDInterview('interview_record')