模版搜索列表

app/controller/template_manage.py

@@ -116,8 +116,9 @@ class TemplateList(Resource):
     def get(self):
         """获取模版列表分页数据."""
         self.parser.add_argument('type', type=int, required=True, help='0为全部1为持仓报告2为诊断报告')
-        self.parser.add_argument('pageNumber', type=int, required=False)
-        self.parser.add_argument('pageSize', type=int, required=False)
+        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)
         args = self.parser.parse_args()
         args['ifa_id'] = self.ifa_id
         data = get_template_list(args)

app/service/template_manage_service.py

@@ -117,19 +117,19 @@ def get_template_list(args):
     pageSize = args['pageSize']
     offset = (pageNumber - 1) * pageSize
     dtype = args.get('type')
+    name = args.get('name', '')
+    conditions = [
+        FundReportManange.delete_tag == 0,
+        FundReportManange.ifa_id == args.get('ifa_id')
+    ]
+    if name:
+        conditions.append(FundReportManange.name.like('%' + name + '%'))
+    if dtype != 0:
+        conditions.append(FundReportManange.type == args.get('type'))
     with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
         tamp_diagnose_session = tamp_diagnose_app.session
-        res = []
-        if dtype == 0:
-            res = tamp_diagnose_session.query(FundReportManange).filter(and_(
-                FundReportManange.delete_tag == 0,
-                FundReportManange.ifa_id == args.get('ifa_id')
-            ))
-        else:
-            res = tamp_diagnose_session.query(FundReportManange).filter(and_(
-                FundReportManange.delete_tag == 0,
-                FundReportManange.ifa_id == args.get('ifa_id'),
-                FundReportManange.type == args.get('type')
+        res = tamp_diagnose_session.query(FundReportManange).filter(and_(
+                *conditions
             ))
         if not res:
             return False