Merge branch 'sp' into 'master'

Sp

See merge request root/tfse_admin!14

macro/Macro.py

@@ -53,3 +53,17 @@ class Macro:
        """
         result = update_macroscopic_data_script(req)
         return result
+
+    @staticmethod
+    def search_macroscopic_data(req, skip, limit):
+        """
+       宏观数据查询
+       Parameters:
+           req: 查询条件
+           skip: 页码
+           limit: 每页条数
+       Returns:
+           result: 查询结果
+       """
+        result = search_macroscopic_data_script(req, skip, limit)
+        return result

macro/db.py

@@ -181,3 +181,16 @@ def update_industry_macroscopic_data(req):
         return True
     else:
         return False
+
+
+def search_macroscopic_data(req, skip, limit):
+    collection = client['宏观']['行业数据']
+    skip = (skip - 1) * limit
+    data = collection.find(req, {'_id': False}).skip(skip).limit(limit)
+    count = collection.find(req).count()
+    record = list(data)
+    result = {
+        "total": count,
+        "data": record
+    }
+    return result

macro/routes.py

@@ -21,7 +21,7 @@ def upload_report():
         file = request.files['file']
         result = macro.upload_macroscopic_report(file)
         if result:
-            return {"info": "上传成功", "result": {"报告fid": result}}, 200
+            return {"info": "上传成功", "result": {"报告fid": '/file/get_company_report?file_id={}'.format(result)}}, 200
         else:
             return {"info": "上传失败"}, 210
     except KeyError:
@@ -81,6 +81,34 @@ def upload_data():
         return {"info": "参数错误"}, 400
 
 
+@macro_route.route('/search_macro_data', methods=['POST'])
+@api_secret
+def search_data():
+    """
+    查询行业宏观数据
+    Parameters:
+        -
+    Returns:
+        info: 查询结果
+    """
+    try:
+        macro = Macro()
+        req = request.json
+        skip = req['skip']
+        limit = req['limit']
+        del req['skip']
+        del req['limit']
+        result = macro.search_macroscopic_data(req, skip, limit)
+        if result:
+            return {"info": "查询成功", "result": result}, 200
+        else:
+            return {"info": "查询失败"}, 210
+    except KeyError:
+        return {"info": "键值错误"}, 400
+    except TypeError:
+        return {"info": "参数错误"}, 400
+
+
 @macro_route.route('/edit_macro_data', methods=['POST'])
 @api_secret
 def edit_data():

macro/scripts.py

@@ -65,6 +65,9 @@ def search_macroscopic_report_script(industry, time, skip, limit):
         result: 查询结果
     """
     result = find_macroscopic_report_records(industry, time, skip, limit)
+    if len(result['data']) > 0:
+        for item in result['data']:
+            item['报告fid'] = '/file/get_company_report?file_id={}'.format(item['报告fid'])
     return result
 
 
@@ -92,6 +95,20 @@ def update_macroscopic_data_script(req):
     return result
 
 
+def search_macroscopic_data_script(req, skip, limit):
+    """
+    查询行业宏观数据
+    Parameters:
+        req: 查询条件
+        skip: 页码
+        limit: 每页条数
+    Returns:
+        result: 查询结果
+    """
+    result = search_macroscopic_data(req, skip, limit)
+    return result
+
+
 def get_macro_data():
     df = pd.read_excel('./static/C13-02.xlsx')
     for index, row in df.iterrows():
@@ -125,5 +142,8 @@ def get_macro_data_over():
             upload_overview_macroscopic_data(req)
 
 
+
+
+
 if __name__ == '__main__':
     get_macro_data_over()

rating/routes.py

@@ -124,7 +124,7 @@ def report_edit_save_delete():
             else:
                 return {"info": "删除失败"}
         else:
-            return {"info": "编辑失败"}
+            return {"info": "此公司不存在报告数据"}
     except KeyError:
         return {"info": "键值错误"}, 400
     except TypeError:

rating/scripts.py

@@ -16,7 +16,7 @@ def search_rating_script(query, skip, limit):
     result = find_rating_records(query, skip, limit)
     for item in result:
         item['报告fid'] = '/file/get_company_report?file_id={}'.format(item['报告fid'])
-        item['证书fid'] = '/file/get_company_certificate?file_id={}'.format(item['证书fid'])
+        item['证书fid'] = '/file/get_certification?file_id={}'.format(item['证书fid'])
     return result
 
 
@@ -124,4 +124,5 @@ def report_create_script(rid):
     result = r.json()
     if result['info'] == '生成报告成功':
         update_evaluation_records(rid, {"报告fid": result['result']['FileID']})
+    result['result']['FileID'] = '/file/get_company_report?file_id={}'.format(result['result']['FileID'])
     return result