diff --git a/api/api_v1/endpoints/interview.py b/api/api_v1/endpoints/interview.py index 89e58c7..46b760d 100644 --- a/api/api_v1/endpoints/interview.py +++ b/api/api_v1/endpoints/interview.py @@ -161,7 +161,17 @@ async def interview_find( return schemas.Msg(code=200, msg='无数据', data=[]) # 格式化数据 res_data = chkData(data) - return schemas.Msg(code=200, msg='ok', data=res_data) + + # 统计数量 + manner_2_num = len([1 for i in res_data if i['hr_manner'] == 2]) + manner_01_num = len([1 for i in res_data if i['hr_manner'] in [0, 1]]) + + res_msg = { + 'data': res_data, + 'manner_2_num': manner_2_num, + 'manner_01_num': manner_01_num, + } + return schemas.Msg(code=200, msg='ok', data=res_msg) # 面试_主页初筛查询 diff --git a/models/interview_zsgc.py b/models/interview_zsgc.py index c0cbc0c..21c1c14 100644 --- a/models/interview_zsgc.py +++ b/models/interview_zsgc.py @@ -312,9 +312,16 @@ class InterviewDo: else: whereStr += str(key) + ' like ' + "'%" + i + "%'" + ' ' continue + if value == '': + continue # 单个条件 whereStr += str(key) + ' like ' + "'%" + value + "%'" + ' ' continue + if key == 'hr_manner': + + if value == '': + whereStr += str(key) + ' = ' + str(0) + ' ' + whereStr += 'or ' + str(key) + ' = ' + str(1) + ' ' if isinstance(value, str): if not value.strip(): continue