|
@@ -221,6 +221,7 @@ class PestCountAPIView(APIView):
|
|
|
try:
|
|
try:
|
|
|
# regionCode=city_410100&page=1&pageSize=20&startDate=2025-12-04&endDate=2025-12-19
|
|
# regionCode=city_410100&page=1&pageSize=20&startDate=2025-12-04&endDate=2025-12-19
|
|
|
data = request.query_params
|
|
data = request.query_params
|
|
|
|
|
+ pest = data.get("pest")
|
|
|
code = data.get("regionCode")
|
|
code = data.get("regionCode")
|
|
|
code = code.split("_")[-1]
|
|
code = code.split("_")[-1]
|
|
|
start = data.get("startDate")
|
|
start = data.get("startDate")
|
|
@@ -247,6 +248,8 @@ class PestCountAPIView(APIView):
|
|
|
start = int(datetime.datetime.strptime(start, "%Y-%m-%d").timestamp())
|
|
start = int(datetime.datetime.strptime(start, "%Y-%m-%d").timestamp())
|
|
|
end = int(datetime.datetime.strptime(end, "%Y-%m-%d").timestamp())
|
|
end = int(datetime.datetime.strptime(end, "%Y-%m-%d").timestamp())
|
|
|
query = query.filter(date__range=[start, end])
|
|
query = query.filter(date__range=[start, end])
|
|
|
|
|
+ if pest:
|
|
|
|
|
+ query = query.filter(pest__icontains=pest)
|
|
|
count = query.count()
|
|
count = query.count()
|
|
|
query = query[(page-1)*pageSize:page*pageSize]
|
|
query = query[(page-1)*pageSize:page*pageSize]
|
|
|
data = CbdAddrPestSerializer(query, many=True).data
|
|
data = CbdAddrPestSerializer(query, many=True).data
|