综合信用评价模块 升级至v0.21版本

cc_rating/cc_impl.py

@@ -173,7 +173,7 @@ def save_cc_rating_input_form(cid, input_form):
             update_process_status(rid, {"评价流程.财务数据填报": 1})
 
 
-def choose_industry_script():
+def choose_industry_impl():
     """
     选择行业
     Parameters:

cc_rating/cc_obj.py

@@ -57,15 +57,11 @@ class CCRating:
             return info, 210
 
     @staticmethod
-    def choose_industry_obj():
+    def choose_industry():
         """
         选择行业
-        Parameters:
-            -
-        Returns:
-            res: desc
         """
-        return choose_industry_script()
+        return choose_industry_impl()
 
     def questionnaire_obj(self):
         """

cc_rating/cc_routes.py

@@ -85,8 +85,8 @@ def choose_industry_route(**kwargs):
     Returns:
         -
     """
-    input_form = CCRating()
-    result = input_form.choose_industry_obj()
+    cc_rating = CCRating()
+    result = cc_rating.choose_industry()
     return {"info": "查询成功", "result": result}
 
 

cc_rating/cc_utils.py

@@ -6,7 +6,7 @@ import random
 
 import requests
 
-from cc_rating.cc_db import FIND_RATING_RECORDS, find_rating_inputs
+from cc_rating.cc_db import FIND_RATING_RECORDS, find_rating_inputs, FIND_SINGLE_COLUMN_BY_REQ
 
 
 def get_data_template(template_name):
@@ -109,9 +109,8 @@ def get_company_type(cid):
             若没有查询到行业 返回空值
     """
     # 根据企业ID获取企业当年填报的企业类型
-    choose_industry = find_rating_inputs({"企业ID": cid, "评价年度": get_current_year()})[0]['行业选择']
-
+    choose_industry = FIND_SINGLE_COLUMN_BY_REQ("综信评价数据", "填报数据", {"企业ID": cid, "评价年度": get_current_year()}, '行业选择')
     if not len(choose_industry) > 1:
         return None
     else:
-        return choose_industry[0]
+        return choose_industry[0]