Merge branch 'os' into 'master'

update 查询行业问卷接口

See merge request root/tfse_admin!12

Model/model_impl.py

@@ -52,7 +52,7 @@ def insert_question_scripts(question):
 
 def insert_questionnaire_scripts(questionnaire):
     """
-
+    更新（插入）问卷数据
     Parameters:
         questionnaire: dict 问卷数据（由问题数据构成）
     Returns:
@@ -69,3 +69,19 @@ def insert_questionnaire_scripts(questionnaire):
         return '录入成功'
     else:
         return '录入失败'
+
+
+def get_questionnaire_scripts(types, industry):
+    """
+    根据评价类型和行业查询相对应问卷数据
+    Parameters:
+        types: str 评价类型
+        industry: str 行业
+    Returns:
+        result: dict 查询结果
+    """
+    data = find_records('问卷', '问卷数据', {"评价类型": types, "行业": industry})
+    if data:
+        return data[0]
+    else:
+        return False

Model/model_obj.py

@@ -1,4 +1,4 @@
-from Model.model_impl import insert_question_scripts, insert_questionnaire_scripts
+from Model.model_impl import insert_question_scripts, insert_questionnaire_scripts, get_questionnaire_scripts
 
 
 class ModelObj:
@@ -6,6 +6,8 @@ class ModelObj:
     def __init__(self):
         self.question = None
         self.questionnaire = None
+        self.type = None
+        self.industry = None
 
     def insert_question(self):
         """
@@ -19,4 +21,11 @@ class ModelObj:
         新增行业问卷数据
         """
         info = insert_questionnaire_scripts(self.questionnaire)
-        return info
+        return info
+
+    def get_questionnaire(self):
+        """
+        查询行业问卷数据
+        """
+        data = get_questionnaire_scripts(self.type, self.industry)
+        return data

Model/model_routes.py

@@ -42,3 +42,23 @@ def insert_new_questionnaire(**kwargs):
     info = model.insert_questionnaire()
     status = 200 if info == '录入成功' else 210
     return {"info": info}, status
+
+
+@model_route.route('/get_questionnaire', methods=['POST'])
+@verify_token
+@authority_scope(['admin', 'developer', 'analysts', 'operator'])
+def get_questionnaire(**kwargs):
+    """
+    根据行业和填报类型查询行业问卷
+    Parameters:
+        -
+    Returns:
+        info: 返回信息
+        result: 返回数据
+    """
+    model = ModelObj()
+    model.type = request.json['type']
+    model.industry = request.json['industry']
+    data = model.get_questionnaire()
+    status = 200 if data else 210
+    return {"data": data}, status