|
|
@@ -39,10 +39,10 @@ class LandPlanInfoAPIView(APIView):
|
|
|
if year:
|
|
|
start_timestamp = datetime.datetime(int(year), 1,1,0,0).timestamp()
|
|
|
end_timestatmp = datetime.datetime(int(year), 12,31,23,59).timestamp()
|
|
|
- queryset = queryset.filter(addtime__gte=start_timestamp, addtime__lte=end_timestatmp)
|
|
|
+ queryset = queryset.filter(recovery_time__gte=start_timestamp, recovery_time__lte=end_timestatmp)
|
|
|
if plan:
|
|
|
ids_lst = MongoPlantInfo.objects.filter(plantname__icontains=plan).values_list("id", flat=True)
|
|
|
- queryset = queryset.filter(id__in = ids_lst)
|
|
|
+ queryset = queryset.filter(plan_id__in = ids_lst)
|
|
|
total_obj = queryset.count()
|
|
|
paginator = Paginator(queryset, page_size)
|
|
|
page_obj = paginator.get_page(page_num)
|