From c98ec7dae8c600c4f47d007710b3708a9d097a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E5=B7=9D?= <sichanwong0527@gmail.com>
Date: Tue, 22 Mar 2022 16:06:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E4=BF=A1=E7=94=A8=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E6=A8=A1=E5=9D=97=20=E5=8D=87=E7=BA=A7=E8=87=B3v0.21?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cc_rating/cc_impl.py   | 2 +-
 cc_rating/cc_obj.py    | 8 ++------
 cc_rating/cc_routes.py | 4 ++--
 cc_rating/cc_utils.py  | 7 +++----
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/cc_rating/cc_impl.py b/cc_rating/cc_impl.py
index 37ff7f4..3fa1504 100644
--- a/cc_rating/cc_impl.py
+++ b/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:
diff --git a/cc_rating/cc_obj.py b/cc_rating/cc_obj.py
index 7d7d3ff..5871daa 100644
--- a/cc_rating/cc_obj.py
+++ b/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):
         """
diff --git a/cc_rating/cc_routes.py b/cc_rating/cc_routes.py
index 4a7bee5..97f7118 100644
--- a/cc_rating/cc_routes.py
+++ b/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}
 
 
diff --git a/cc_rating/cc_utils.py b/cc_rating/cc_utils.py
index 3995d7b..9592839 100644
--- a/cc_rating/cc_utils.py
+++ b/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]
\ No newline at end of file
+        return choose_industry[0]