DigitalMgnt
/
tfse-admin-api-v0.2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sg' into 'master' 

update search接口bug

See merge request root/tfse_admin!9
This commit is contained in:
王思川 2022-01-14 07:38:41 +00:00
parent e208037f9b 675c59ceb5
commit a107ea975d
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
company/db.py
View File

@ -16,12 +16,17 @@ def find_company_records(query, skip, limit):
record: 查询结果 record: 查询结果
""" """
collection = client['用户']['用户信息'] collection = client['用户']['用户信息']
data = collection.find({"企业ID": query}, {'企业ID': True, '企业名称': True, '_id': False}).skip(skip).limit(limit) if query:
record = list(data) data = collection.find({"企业ID": query}, {'企业ID': True, '企业名称': True, '_id': False}).skip(skip).limit(limit)
if len(record) == 0:
data = collection.find({"企业名称": re.compile(query)}, {'企业ID': True, '企业名称': True, '_id': False}).skip(skip).limit(limit)
record = list(data) record = list(data)
return record if len(record) == 0:
data = collection.find({"企业名称": re.compile(query)}, {'企业ID': True, '企业名称': True, '_id': False}).skip(skip).limit(limit)
record = list(data)
return record
else:
data = collection.find({}, {'企业ID': True, '企业名称': True, '_id': False}).skip(skip).limit(limit)
record = list(data)
return record
def find_user_info(cid): def find_user_info(cid):

2
company/scripts.py
View File

@ -6,6 +6,8 @@ def search_company_script(query, skip, limit):
查询企业信息 查询企业信息
Parameters: Parameters:
query: 查询条件（企业名称/企业id） query: 查询条件（企业名称/企业id）
skip: 默认0
limit: 每页显示条数
Returns: Returns:
result: 返回数据 result: 返回数据
""" """

17
rating/db.py
View File

@ -18,15 +18,20 @@ def find_rating_records(query, skip, limit):
record: 查询结果 record: 查询结果
""" """
collection = client['评价']['评价记录'] collection = client['评价']['评价记录']
data = collection.find({"企业ID": query}, {'_id': False}).skip(skip).limit(limit) if query:
record = list(data) data = collection.find({"企业ID": query}, {'_id': False}).skip(skip).limit(limit)
if len(record) == 0:
data = collection.find({"评价ID": query}, {'_id': False}).skip(skip).limit(limit)
record = list(data) record = list(data)
if len(record) == 0: if len(record) == 0:
data = collection.find({"评价时间": re.compile(query)}, {'_id': False}).skip(skip).limit(limit) data = collection.find({"评价ID": query}, {'_id': False}).skip(skip).limit(limit)
record = list(data) record = list(data)
return record if len(record) == 0:
data = collection.find({"评价时间": re.compile(query)}, {'_id': False}).skip(skip).limit(limit)
record = list(data)
return record
else:
data = collection.find({}, {'_id': False}).skip(skip).limit(limit)
record = list(data)
return record
def find_rating_result_records(rid): def find_rating_result_records(rid):