报告列表

app/service/report_service.py

@@ -47,15 +47,23 @@ def get_report_list(args):
             PeriodicReport.update_time <= end_time
         ))
         if type == 0:
-            res = hold_report.union_all(hold_diagnose_report).union_all(periodic_report)
+            if hold_report.all():
+                res.extend(hold_report)
+            if hold_diagnose_report.all():
+                res.append(hold_diagnose_report)
+            if periodic_report.all():
+                res.append(periodic_report)
+            # res = hold_report.union_all(hold_diagnose_report).union_all(periodic_report)
         elif type == 1:
             res = hold_report
         elif type == 2:
             res = hold_diagnose_report
         elif type == 3:
             res = periodic_report
-    totalSize = res.count()
-    data = res.offset(offset).limit(pageSize)
+    # totalSize = res.count()
+    # data = res.offset(offset).limit(pageSize)
+    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]
@@ -120,7 +128,9 @@ def get_one_report(args):
         elif type == 3:
             res = periodic_report
     data = [r.to_dict() for r in res]
+    if data:
         return data[0]
+    return False
 
 
 def edit_report(args):