Merge branch 'ps' into 'master'
update 获取企业测评流程接口 See merge request root/tfse_admin!3
This commit is contained in:
commit
8e43cf70fc
|
@ -3,6 +3,7 @@ from bson import ObjectId
|
||||||
from gridfs import GridFS
|
from gridfs import GridFS
|
||||||
|
|
||||||
client = pymongo.MongoClient('mongodb://{}:{}@{}:{}'.format('root', 'sromitdTW569kC#M', '116.63.130.34', 27018))
|
client = pymongo.MongoClient('mongodb://{}:{}@{}:{}'.format('root', 'sromitdTW569kC#M', '116.63.130.34', 27018))
|
||||||
|
client_admin = pymongo.MongoClient('mongodb://{}:{}@{}:{}'.format('root', 'RYIHrqml#LSW6#!*', '116.63.130.34', 27020))
|
||||||
|
|
||||||
|
|
||||||
def delete_data(param1, param2, param3):
|
def delete_data(param1, param2, param3):
|
||||||
|
@ -35,6 +36,36 @@ def find_data(param1, param2, param3):
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
||||||
|
def find_admin_data(param1, param2, param3):
|
||||||
|
"""
|
||||||
|
根据查询条件查询符合条件的所有数据
|
||||||
|
Parameters:
|
||||||
|
param1: str 数据库
|
||||||
|
param2: str 数据集
|
||||||
|
param3: obj 查询条件
|
||||||
|
Returns:
|
||||||
|
res: list 符合条件的数据
|
||||||
|
"""
|
||||||
|
collection = client_admin[param1][param2]
|
||||||
|
res = list(collection.find(param3, {'_id': False}))
|
||||||
|
return res
|
||||||
|
|
||||||
|
|
||||||
|
def insert_admin_data(param1, param2, param3):
|
||||||
|
"""
|
||||||
|
根据查询条件查询符合条件的所有数据
|
||||||
|
Parameters:
|
||||||
|
param1: str 数据库
|
||||||
|
param2: str 数据集
|
||||||
|
param3: obj 查询条件
|
||||||
|
Returns:
|
||||||
|
res: list 符合条件的数据
|
||||||
|
"""
|
||||||
|
collection = client_admin[param1][param2]
|
||||||
|
collection.insert_one(param3)
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
def update_user_info_by_cid(cid, data):
|
def update_user_info_by_cid(cid, data):
|
||||||
"""
|
"""
|
||||||
更新用户信息
|
更新用户信息
|
||||||
|
|
|
@ -13,7 +13,7 @@ from Crypto.Cipher import PKCS1_v1_5 as PKCS1_cipher
|
||||||
|
|
||||||
from Board.board_db import FIND_DATA, INSERT_DATA
|
from Board.board_db import FIND_DATA, INSERT_DATA
|
||||||
from TestCenter.tc_db import update_user_info_by_cid, find_user_info_by_cid, delete_data, find_data, update_data, \
|
from TestCenter.tc_db import update_user_info_by_cid, find_user_info_by_cid, delete_data, find_data, update_data, \
|
||||||
delete_pdf
|
delete_pdf, find_admin_data, insert_admin_data
|
||||||
|
|
||||||
|
|
||||||
def search_evaluate_record_scripts(types):
|
def search_evaluate_record_scripts(types):
|
||||||
|
@ -568,3 +568,17 @@ def new_test_company_impl(email, company, code, legal_person):
|
||||||
return company_verify_script(company, code, legal_person, cid)
|
return company_verify_script(company, code, legal_person, cid)
|
||||||
|
|
||||||
return new_company_main_process()
|
return new_company_main_process()
|
||||||
|
|
||||||
|
|
||||||
|
def get_company_process_script(rid, cid):
|
||||||
|
"""
|
||||||
|
查询企业测评流程
|
||||||
|
Parameters:
|
||||||
|
rid str 评价ID
|
||||||
|
cid str 企业ID
|
||||||
|
Returns:
|
||||||
|
result dict 流程数据
|
||||||
|
"""
|
||||||
|
data = find_admin_data("看板", "评价流程", {"评价ID": rid, "企业ID": cid})
|
||||||
|
return data
|
||||||
|
|
||||||
|
|
|
@ -67,3 +67,10 @@ class TestObj:
|
||||||
"""
|
"""
|
||||||
info = generate_rid_information_script(self.rid, self.types)
|
info = generate_rid_information_script(self.rid, self.types)
|
||||||
return info
|
return info
|
||||||
|
|
||||||
|
def get_company_process(self):
|
||||||
|
"""
|
||||||
|
获取企业测评流程
|
||||||
|
"""
|
||||||
|
data = get_company_process_script(self.rid, self.cid)
|
||||||
|
return data
|
||||||
|
|
|
@ -130,3 +130,21 @@ def new_company_route(**kwargs):
|
||||||
test_obj.legal_person = request.json['legal_person']
|
test_obj.legal_person = request.json['legal_person']
|
||||||
info = test_obj.new_test_company()
|
info = test_obj.new_test_company()
|
||||||
return {"info": info}, 200
|
return {"info": info}, 200
|
||||||
|
|
||||||
|
|
||||||
|
@test_route.route('/get_company_process', methods=['POST'])
|
||||||
|
@verify_token
|
||||||
|
def get_company_process():
|
||||||
|
"""
|
||||||
|
获取评测流程
|
||||||
|
Parameters:
|
||||||
|
-
|
||||||
|
Returns:
|
||||||
|
result dict 流程数据
|
||||||
|
"""
|
||||||
|
test_obj = TestObj()
|
||||||
|
test_obj.rid = request.json['rid']
|
||||||
|
test_obj.cid = request.json['cid']
|
||||||
|
info = test_obj.get_company_process()
|
||||||
|
status = 200 if info else 210
|
||||||
|
return {"info": info}, status
|
||||||
|
|
Loading…
Reference in New Issue