|
|
@@ -2719,6 +2719,9 @@ class Type_View(ListView):
|
|
|
dat2 = []
|
|
|
dat3 = []
|
|
|
dat4 = []
|
|
|
+ start_date = datetime.datetime.now().year
|
|
|
+ start_date = datetime.date(start_date,1,1)
|
|
|
+ end_date = datetime.datetime.now()
|
|
|
if area:
|
|
|
# area_obj = GardenArea.objects.get(id=area)
|
|
|
for i in FarmList.objects.filter(garden_id=area):
|
|
|
@@ -2742,7 +2745,10 @@ class Type_View(ListView):
|
|
|
dat4.append({"farm":i.name,"money":money})
|
|
|
money = 0
|
|
|
for i in FarmList.objects.filter(garden_id=area):
|
|
|
- dat.append({"area":i.area,"name":i.name})
|
|
|
+ for x in Sell_Manage.objects.filter(farm=i,upl_time__range=(start_date, end_date)):
|
|
|
+ money = money + int(x.money)
|
|
|
+ dat.append({"area":i.area,"name":i.name,"money":money})
|
|
|
+ money = 0
|
|
|
|
|
|
data = json.dumps({"1":dat1,"2":dat2,"3":dat3,"4":dat4,"dat":dat})
|
|
|
return HttpResponse(data)
|