From 1516439943aabdde246349a92341b9df771cd181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80=C3=AE=C3=97=C3=9A=C3=95=C3=B1?= Date: Fri, 16 Sep 2022 18:52:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api_v1/endpoints/forms.py | 4 ++-- models/interview_zsgc.py | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/api/api_v1/endpoints/forms.py b/api/api_v1/endpoints/forms.py index 6507c8e..f145837 100644 --- a/api/api_v1/endpoints/forms.py +++ b/api/api_v1/endpoints/forms.py @@ -1407,7 +1407,7 @@ async def interview_job_num_form( current_user: schemas.UserDB = Depends(deps.get_current_user) ) -> schemas.Msg: """ 开放中的职位 """ - job_data = await crud.jobs.all_some_field + job_data = await crud.jobs.all_some_field(db) value = list(set([i['job_name'] for i in job_data])) # 获取报表相关参数 table_id = interview.data_in.get('table_id', '') @@ -1438,7 +1438,7 @@ async def interview_job_need_num_form( current_user: schemas.UserDB = Depends(deps.get_current_user) ) -> schemas.Msg: """ 职位招聘人数 """ - job_data = await crud.jobs.all_some_field + job_data = await crud.jobs.all_some_field(db) value = [i['job_num'] for i in job_data] # 获取报表相关参数 table_id = interview.data_in.get('table_id', '') diff --git a/models/interview_zsgc.py b/models/interview_zsgc.py index 0c1364a..700460e 100644 --- a/models/interview_zsgc.py +++ b/models/interview_zsgc.py @@ -576,7 +576,11 @@ class InterviewDo: "pass_text"] for fstr in self.find_column: findStr += fstr + ', ' + is_date = 0 for key, value in self.where.items(): + if key in ['start_time', 'end_time']: + is_date = 1 + continue if isinstance(value, str): if not value.strip(): continue @@ -661,6 +665,9 @@ class InterviewDo: findStr += fstr + ', ' is_date = 0 for key, value in self.where.items(): + if key in ['start_time', 'end_time']: + is_date = 1 + continue if isinstance(value, str): if not value.strip(): continue @@ -716,6 +723,9 @@ class InterviewDo: is_date = 0 if self.where: for key, value in self.where.items(): + if key in ['start_time', 'end_time']: + is_date = 1 + continue if isinstance(value, str): if not value.strip(): continue @@ -773,6 +783,9 @@ class InterviewDo: }) if self.where: for key, value in self.where.items(): + if key in ['start_time', 'end_time']: + is_date = 1 + continue if isinstance(value, str): if not value.strip(): continue