报告列表8

app/service/report_service.py

@@ -29,31 +29,41 @@ def get_report_list(args):
     end_time = args.get('end_time')
     offset = (pageNumber - 1) * pageSize
     res = []
+    allow_field = ['id', 'customer_id', 'ifa_id', 'update_time', 'update_status', 'file', 'be_viewed', 'name']
     with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
         tamp_diagnose_session = tamp_diagnose_app.session
         hold_report = tamp_diagnose_session.query(HoldReport).filter(and_(
             HoldReport.ifa_id == ifa_id,
             HoldReport.update_time >= start_time,
             HoldReport.update_time <= end_time
-        )).all()
+        ))
         hold_diagnose_report = tamp_diagnose_session.query(HoldDiagnoseReport).filter(and_(
             HoldDiagnoseReport.ifa_id == ifa_id,
             HoldDiagnoseReport.update_time >= start_time,
             HoldDiagnoseReport.update_time <= end_time
-        )).all()
+        ))
         periodic_report = tamp_diagnose_session.query(PeriodicReport).filter(and_(
             PeriodicReport.ifa_id == ifa_id,
             PeriodicReport.update_time >= start_time,
             PeriodicReport.update_time <= end_time
-        )).all()
+        ))
+        if hold_report.all():
+            hold_report = [r.to_dict(allow_field=allow_field) for r in hold_report]
+        else:
+            hold_report = []
+        if hold_diagnose_report.all():
+            hold_diagnose_report = [r.to_dict(allow_field=allow_field) for r in hold_diagnose_report]
+        else:
+            hold_diagnose_report = []
+        if periodic_report.all():
+            periodic_report = [r.to_dict(allow_field=allow_field) for r in periodic_report]
+        else:
+            periodic_report = []
         if type == 0:
-            if hold_report:
-                res.extend(hold_report)
-            if hold_diagnose_report:
-                res.append(hold_diagnose_report)
-            if periodic_report:
-                res.append(periodic_report)
             # res = hold_report.union_all(hold_diagnose_report).union_all(periodic_report)
+            res.extend(hold_report)
+            res.extend(hold_diagnose_report)
+            res.extend(periodic_report)
         elif type == 1:
             res = hold_report
         elif type == 2:
@@ -62,11 +72,10 @@ def get_report_list(args):
             res = periodic_report
     # totalSize = res.count()
     # data = res.offset(offset).limit(pageSize)
+    # if data:
+    #     data = [r.to_dict(allow_field=allow_field) for r in data]
     totalSize = len(res)
-    data = res[offset: pageSize]
-    if data:
-        allow_field = ['id', 'customer_id', 'ifa_id', 'update_time', 'update_status', 'file', 'be_viewed', 'name']
-        data = [r.to_dict(allow_field=allow_field) for r in data]
+    data = res[offset:pageSize]
     return {
         'content': data,
         'pageNum': pageNumber,