Merge branch 'ev' into 'master'
update 报告编辑保存删除生成流程/解决请求参数为空时胃分页的问题 See merge request root/tfse_admin!6
This commit is contained in:
commit
050b6025da
|
@ -7,7 +7,7 @@ class Rating:
|
|||
self.query = None
|
||||
self.rid = None
|
||||
|
||||
def search_rating(self):
|
||||
def search_rating(self, skip, limit):
|
||||
"""
|
||||
企业评价记录搜索
|
||||
Parameters:
|
||||
|
@ -15,7 +15,7 @@ class Rating:
|
|||
Returns:
|
||||
result: 查询结果
|
||||
"""
|
||||
result = search_rating_script(self.query)
|
||||
result = search_rating_script(self.query, skip, limit)
|
||||
return result
|
||||
|
||||
def search_rating_result(self):
|
||||
|
|
13
rating/db.py
13
rating/db.py
|
@ -1,27 +1,30 @@
|
|||
import re
|
||||
|
||||
import pymongo
|
||||
from bson import ObjectId
|
||||
from gridfs import GridFS
|
||||
|
||||
client = pymongo.MongoClient('mongodb://{}:{}@{}:{}'.format('root', 'sromitdTW569kC#M', '116.63.130.34', 27018))
|
||||
|
||||
|
||||
def find_rating_records(query):
|
||||
def find_rating_records(query, skip, limit):
|
||||
"""
|
||||
查询企业评价记录
|
||||
Parameters:
|
||||
query: 查询条件
|
||||
skip: 默认0
|
||||
limit: 查询条数
|
||||
Returns:
|
||||
record: 查询结果
|
||||
"""
|
||||
collection = client['评价']['评价记录']
|
||||
data = collection.find({"企业ID": query}, {'_id': False})
|
||||
data = collection.find({"企业ID": query}, {'_id': False}).skip(skip).limit(limit)
|
||||
record = list(data)
|
||||
if len(record) == 0:
|
||||
data = collection.find({"评价ID": query}, {'_id': False})
|
||||
data = collection.find({"评价ID": query}, {'_id': False}).skip(skip).limit(limit)
|
||||
record = list(data)
|
||||
if len(record) == 0:
|
||||
data = collection.find({"评价时间": re.compile(query)}, {'_id': False})
|
||||
data = collection.find({"评价时间": re.compile(query)}, {'_id': False}).skip(skip).limit(limit)
|
||||
record = list(data)
|
||||
return record
|
||||
|
||||
|
@ -94,7 +97,7 @@ def delete_report_pdf(fid):
|
|||
database = '评价'
|
||||
collection = '综合信用报告'
|
||||
fs = GridFS(client[database], collection)
|
||||
fs.delete(file_id=fid)
|
||||
fs.delete(ObjectId(fid))
|
||||
return True
|
||||
|
||||
|
||||
|
|
|
@ -18,7 +18,9 @@ def search_rating():
|
|||
"""
|
||||
rating = Rating()
|
||||
rating.query = request.json['query']
|
||||
data = rating.search_rating()
|
||||
skip = request.json['skip']
|
||||
limit = request.json['limit']
|
||||
data = rating.search_rating(skip, limit)
|
||||
return {"info": '查询成功', "result": data}, 200
|
||||
|
||||
|
||||
|
@ -88,51 +90,6 @@ def risk_info():
|
|||
return {"info": "参数错误"}, 400
|
||||
|
||||
|
||||
@rating_route.route('/report_edit', methods=['POST'])
|
||||
@api_secret
|
||||
def report_edit():
|
||||
"""
|
||||
编辑报告数据
|
||||
Parameters:
|
||||
-
|
||||
Returns:
|
||||
info: 编辑结果
|
||||
"""
|
||||
try:
|
||||
rating = Rating()
|
||||
rating.rid = request.json['rid']
|
||||
text_model = request.json['text_model']
|
||||
info = rating.report_edit(text_model)
|
||||
status = 200 if info else 210
|
||||
res = '编辑成功' if info else '编辑失败'
|
||||
return {"info": res}, status
|
||||
except KeyError:
|
||||
return {"info": "键值错误"}, 400
|
||||
except TypeError:
|
||||
return {"info": "参数错误"}, 400
|
||||
|
||||
|
||||
@rating_route.route('/report_create', methods=['POST'])
|
||||
@api_secret
|
||||
def report_create():
|
||||
"""
|
||||
生成报告
|
||||
Parameters:
|
||||
-
|
||||
Returns:
|
||||
info: 生成结果
|
||||
"""
|
||||
try:
|
||||
rating = Rating()
|
||||
rating.rid = request.json['rid']
|
||||
result = rating.report_create()
|
||||
return result.json()
|
||||
except KeyError:
|
||||
return {"info": "键值错误"}, 400
|
||||
except TypeError:
|
||||
return {"info": "参数错误"}, 400
|
||||
|
||||
|
||||
@rating_route.route('/report_edit_save_delete', methods=['POST'])
|
||||
@api_secret
|
||||
def report_edit_save_delete():
|
||||
|
@ -154,7 +111,7 @@ def report_edit_save_delete():
|
|||
|
||||
def create():
|
||||
info = rating.report_create()
|
||||
return info.json()
|
||||
return info
|
||||
|
||||
rating = Rating()
|
||||
rating.rid = request.json['rid']
|
||||
|
|
|
@ -5,15 +5,17 @@ import requests
|
|||
from rating.db import *
|
||||
|
||||
|
||||
def search_rating_script(query):
|
||||
def search_rating_script(query, skip, limit):
|
||||
"""
|
||||
企业评价记录搜索
|
||||
Parameters:
|
||||
query: 查询条件
|
||||
skip: 默认0
|
||||
limit: 查询条数
|
||||
Returns:
|
||||
result: 结果数据
|
||||
"""
|
||||
result = find_rating_records(query)
|
||||
result = find_rating_records(query, skip, limit)
|
||||
return result
|
||||
|
||||
|
||||
|
@ -117,7 +119,8 @@ def report_create_script(rid):
|
|||
res = requests.post(url, headers=headers, data=json.dumps(text_data))
|
||||
return res
|
||||
|
||||
result = generate_report(text_model)
|
||||
r = generate_report(text_model)
|
||||
result = r.json()
|
||||
if result['info'] == '生成报告成功':
|
||||
update_evaluation_records(rid, {"报告fid": result['result']['FileID']})
|
||||
return result
|
||||
|
|
Loading…
Reference in New Issue