update 基本信息接口

Company/Basic/Shareholder/ShareholderImpl.py

@@ -96,12 +96,15 @@ class ShareholderImpl(object):
     @staticmethod
     def delete(**kwargs):
         """删除"""
-        cid = kwargs['cid']
+        param = kwargs['param']
+        cid = param['cid']
+        shareholder = param['shareholder']
 
-        res = DB_TEST.delete_single_data(
+        res = DB_TEST.delete_single_data_in_array(
             "WR_DataBase_v2_test",
             "C3.2_股东信息",
-            {"企业ID": cid}
+            {"企业ID": cid},
+            {"股东列表": {"股东名称": shareholder}}
         )
 
         if res:
@@ -135,7 +138,7 @@ class ShareholderImpl(object):
                 "WR_DataBase_v2_test",
                 "C3.2_股东信息",
                 {"企业ID": cid},
-                {"股东名称": name},
+                {"股东列表": {"股东名称": name}},
                 update_data
             )
             return 'success'
@@ -145,18 +148,31 @@ class ShareholderImpl(object):
     @staticmethod
     def view(**kwargs):
         """查看"""
-        cid = kwargs['cid']
+        query = kwargs['query']
+        cid = query['cid']
+        page_size = int(query['page_size'])
+        page_num = page_size * (int(query['page_num']) - 1)
 
-        record = DB_TEST.find_single_data(
+        total = DB_TEST.find_single_column(
+            'WR_DataBase_v2_test',
+            'C3.2_股东信息',
+            {"企业ID": cid},
+            '股东列表'
+        )
+
+        record = DB_TEST.find_data_with_aggregate(
             "WR_DataBase_v2_test",
             "C3.2_股东信息",
-            {"企业ID": cid},
-            []
+            [
+                {"$match": {"企业ID": cid}},
+                {"$project": {'_id': 0, '股东列表': {"$slice": ["${}".format('股东列表'), page_num, page_size]}}}
+            ]
         )
 
         if record:
             result = {
                 "info": "success",
+                "total": len(total),
                 "result": record
             }
         else:

Company/Basic/Shareholder/ShareholderRoute.py

@@ -23,9 +23,9 @@ def auto_update_route():
 def delete_route():
     """删除"""
     try:
-        RouteParamsCheck(req=request.args, params=["cid"]).required()
+        RouteParamsCheck(req=request.args, params=["cid", "shareholder"]).required()
         impl = ShareholderImpl()
-        result = impl.delete(cid=request.args['cid'])
+        result = impl.delete(param=request.args)
         return result
     except APIReturnError as e:
         return {"info": e.__str__()}, e.status_code
@@ -47,9 +47,9 @@ def edit_route():
 def view_route():
     """查看"""
     try:
-        RouteParamsCheck(req=request.args, params=["cid"]).required()
+        RouteParamsCheck(req=request.args, params=["cid", "page_num", "page_size"]).required()
         impl = ShareholderImpl()
-        result = impl.view(cid=request.args['cid'])
+        result = impl.view(query=request.args)
         return result
     except APIReturnError as e:
         return {"info": e.__str__()}, e.status_code

DBHelper/MongoHelper.py

@@ -223,7 +223,7 @@ class MongoHelper:
 
     def delete_single_data_in_array(self, param1, param2, param3, param4):
         """
-        更新单条数据
+        删除数组中的单条数据
         param1: str 数据库
         param2: str 数据表
         param3: dict 查询条件
@@ -233,10 +233,11 @@ class MongoHelper:
         """
         collection = self.client[param1][param2]
         collection.update_one(param3, {"$pull": param4})
+        return True
 
-    def update_single_data_by_add(self, param1, param2, param3, param4):
+    def add_single_data_in_array(self, param1, param2, param3, param4):
         """
-        更新单条数据
+        新增数组中的单条数据
         param1: str 数据库
         param2: str 数据表
         param3: dict 查询条件

Modules/Indicators/Tags/TagsImpl.py

@@ -215,7 +215,7 @@ class TagsImpl(object):
             obj.questionnaire_name = data['associate_name']
 
         for item in data['tags_id']:
-            DB_TEST.update_single_data_by_add(
+            DB_TEST.add_single_data_in_array(
                 '模型数据',
                 '标签数据',
                 {'标签ID': item},

Modules/TycApi/TycUtils.py

@@ -214,7 +214,7 @@ def page_request(url, company, db, col):
         update_data = res['result']['items']
         update_str = "{}.result".format(col)
         for item in update_data:
-            DB_TYC.update_single_data_by_add(
+            DB_TYC.add_single_data_in_array(
                 db,
                 col,
                 {'企业名称': company},
@@ -328,7 +328,7 @@ def special_page_request(url, company, db, col, types):
         else:
             p_type = types
         for item in update_data:
-            DB_TYC.update_single_data_by_add(
+            DB_TYC.add_single_data_in_array(
                 db,
                 col,
                 {'企业名称': company, '类型': res_type},