leguadmin/prs_server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

新增报表

Browse Source
This commit is contained in:
Àî×ÚÕñ 2022-09-16 18:52:52 +08:00
parent 87327d36e9
commit 1516439943
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/api_v1/endpoints/forms.py
View File

@ -1407,7 +1407,7 @@ async def interview_job_num_form(
current_user: schemas.UserDB = Depends(deps.get_current_user) current_user: schemas.UserDB = Depends(deps.get_current_user)
) -> schemas.Msg: ) -> 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])) value = list(set([i['job_name'] for i in job_data]))
# 获取报表相关参数 # 获取报表相关参数
table_id = interview.data_in.get('table_id', '') 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) current_user: schemas.UserDB = Depends(deps.get_current_user)
) -> schemas.Msg: ) -> 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] value = [i['job_num'] for i in job_data]
# 获取报表相关参数 # 获取报表相关参数
table_id = interview.data_in.get('table_id', '') table_id = interview.data_in.get('table_id', '')

13
models/interview_zsgc.py
View File

@ -576,7 +576,11 @@ class InterviewDo:
"pass_text"] "pass_text"]
for fstr in self.find_column: for fstr in self.find_column:
findStr += fstr + ', ' findStr += fstr + ', '
is_date = 0
for key, value in self.where.items(): for key, value in self.where.items():
if key in ['start_time', 'end_time']:
is_date = 1
continue
if isinstance(value, str): if isinstance(value, str):
if not value.strip(): if not value.strip():
continue continue
@ -661,6 +665,9 @@ class InterviewDo:
findStr += fstr + ', ' findStr += fstr + ', '
is_date = 0 is_date = 0
for key, value in self.where.items(): for key, value in self.where.items():
if key in ['start_time', 'end_time']:
is_date = 1
continue
if isinstance(value, str): if isinstance(value, str):
if not value.strip(): if not value.strip():
continue continue
@ -716,6 +723,9 @@ class InterviewDo:
is_date = 0 is_date = 0
if self.where: if self.where:
for key, value in self.where.items(): for key, value in self.where.items():
if key in ['start_time', 'end_time']:
is_date = 1
continue
if isinstance(value, str): if isinstance(value, str):
if not value.strip(): if not value.strip():
continue continue
@ -773,6 +783,9 @@ class InterviewDo:
}) })
if self.where: if self.where:
for key, value in self.where.items(): for key, value in self.where.items():
if key in ['start_time', 'end_time']:
is_date = 1
continue
if isinstance(value, str): if isinstance(value, str):
if not value.strip(): if not value.strip():
continue continue