报告列表3

app/service/report_service.py

@@ -35,23 +35,23 @@ def get_report_list(args):
             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 type == 0:
-            if hold_report.all():
+            if hold_report:
                 res.extend(hold_report)
-            if hold_diagnose_report.all():
+            if hold_diagnose_report:
                 res.append(hold_diagnose_report)
-            if periodic_report.all():
+            if periodic_report:
                 res.append(periodic_report)
             # res = hold_report.union_all(hold_diagnose_report).union_all(periodic_report)
         elif type == 1: