Merge branch 'v0.21' into 'master'

评价流程 升级到v0.21

See merge request root/etl_tfse!10

company/db.py

@@ -95,3 +95,18 @@ def UPSERT_SINGLE_DATA(param1, param2, param3, param4):
     """
     collection = client_tfse_021[param1][param2]
     collection.update_one(param3, {"$set": param4}, upsert=True)
+
+
+def UPDATE_SINGLE_DATA(param1, param2, param3, param4):
+    """
+    插入单条数据
+    Parameters:
+        param1: str 数据库
+        param2: str 数据表
+        param3: dict 查询条件
+        param4: dict 更新或新插入的数据
+    """
+    collection = client_tfse_021[param1][param2]
+    res = collection.update_one(param3, {"$set": param4})
+    info = res.raw_result['updatedExisting']
+    return info

company/routes.py

@@ -87,8 +87,8 @@ def update_process():
     rid = request.json['rid']
     renew_data = request.json['renew_data']
     types = request.json['types']
-
+    db = "综信评价数据" if types == "综合评价流程" else "ESG评价数据"
-    info = update_process_scripts(types, rid, renew_data)
+    info = update_process_scripts(db, rid, renew_data)
     status = 200 if info else 210
     result = '更新成功' if info else '更新失败'
     return {"info": result}, status

company/scripts.py

@@ -7,7 +7,7 @@ import pandas as pd
 
 from common.scripts import read_json_file, sub_dict, df_iterrows
 from company.db import find_data_in_tyc, insert_data_to_tfse, find_data_in_tfse, conserve_data_to_tfse, update_data, \
-    UPSERT_SINGLE_DATA
+    UPSERT_SINGLE_DATA, UPDATE_SINGLE_DATA
 from rating.scripts.risk_detail import associate_risk_detail, change_log_detail
 
 
@@ -820,11 +820,11 @@ def update_process_scripts(param1, param2, param3):
     """
     更新流程数据
     Parameters:
-        param1 dict 数据集名称
+        param1 dict 数据库名称
         param2 str 评价ID
         param3 dict 需要更新的数据
     Returns:
         result bool 更新结果
     """
-    info = update_data('评价', param1, {"评价ID": param2}, param3)
+    info = UPDATE_SINGLE_DATA(param1, "评价流程", {"评价ID": param2}, param3)
     return info