Merge branch 'manage-public' of http://47.100.44.39:10001/pengxiong/fund_report into manage-public

app/controller/template_manage.py

@@ -108,8 +108,8 @@ class TemplateList(Resource):
         """获取模版列表分页数据."""
         self.parser.add_argument('type', type=int, required=True, help='0为全部1为持仓报告2为诊断报告')
         self.parser.add_argument('name', type=str, required=False, help='模版名称')
-        self.parser.add_argument('pageNumber', type=int, required=True)
-        self.parser.add_argument('pageSize', type=int, required=True)
+        self.parser.add_argument('pageNumber', type=int, required=False)
+        self.parser.add_argument('pageSize', type=int, required=False)
         args = self.parser.parse_args()
         args['ifa_id'] = g.ifa_id
         data = get_template_list(args)

app/service/template_manage_service.py

@@ -125,9 +125,9 @@ def delete_template(args):
 
 def get_template_list(args):
     """."""
-    pageNumber = args['pageNumber']
-    pageSize = args['pageSize']
-    offset = (pageNumber - 1) * pageSize
+    # pageNumber = args.get('pageNumber')
+    # pageSize = args.get('pageSize')
+    # offset = (pageNumber - 1) * pageSize
     dtype = args.get('type')
     name = args.get('name', '')
     conditions = [
@@ -173,12 +173,12 @@ def get_template_list(args):
         if not res:
             return False
         totalSize = res.count()
-        data = res.order_by(FundReportManange.create_time.desc()).offset(offset).limit(pageSize)
+        data = res.order_by(FundReportManange.create_time.desc())
         data = [r.to_dict() for r in data]
         return {
             'content': data,
-            'pageNum': pageNumber,
-            'pageSize': pageSize,
+            # 'pageNum': pageNumber,
+            # 'pageSize': pageSize,
             'totalSize': totalSize
         }