修改种植管理与地块关系

apps/AppInfo/models.py

@@ -539,7 +539,7 @@ class Store_Manage(models.Model):
 # 区域种植统计
 class Areacrop(models.Model):
     cropname = models.CharField(u'作物名称', max_length=20, blank=True, null=True)
-    area = models.ForeignKey(GardenArea,blank=True, null=True,verbose_name=u'所属地块')
+    area = models.ForeignKey(FarmList,blank=True, null=True,verbose_name=u'所属地块')
     crop_count = models.CharField(u'作物数量', max_length=20, blank=True, null=True)
     upl_time = models.DateTimeField(u'种植时间', blank=True, null=True)
     end_time = models.DateTimeField(u'结束时间', blank=True, null=True)

apps/Equipment/views.py

@@ -2025,10 +2025,10 @@ class Park_Land(ListView):
         data = []
         if current_user.is_superuser != True and current_user.is_staff != True:
             #用户
-            art_list = GardenArea.objects.filter(user=current_user)
+            art_list = FarmList.objects.filter(user=current_user)
         else:
             #管理员
-            art_list = GardenArea.objects.all()
+            art_list = FarmList.objects.all()
         for i in art_list:
             data.append({"name":i.name,"id":i.id})
         data = json.dumps(data)
@@ -2046,7 +2046,7 @@ class Garden_Manage_New(ListView):
         garden = GardenArea.objects.get(id=gardenid)
         art_list = FarmList.objects.filter(garden=garden)
 
-        nums = art_list.count()
+        nums = len(art_list)
         page = int(request.GET.get('page'))
         art = art_list[(9*(page-1)):(page*9)]
         return render(request, 'backstageNet/production/gardenNew.html', context={"art":art,"nums":nums})
@@ -2537,7 +2537,22 @@ class Cropdata(ListView):
 # 种植统计
 class CropCount(ListView):
     def get(self,request):
-        return render(request, 'backstageNet/production/cropcount.html', context={})
+        username = request.user.username
+        print('username:',username)
+        current_user = MyUser.objects.get(username=username)
+        gardenname = request.GET.get("name")
+        if current_user.is_staff == True:
+            garden = GardenArea.objects.all()
+        elif current_user.is_staff != True:
+            garden = GardenArea.objects.filter(user=current_user)
+        if gardenname:
+            garden = GardenArea.objects.filter(name=gardenname)
+        farm = FarmList.objects.filter(garden=garden[0])
+        if current_user.is_staff == True:
+            garden = GardenArea.objects.all()
+        elif current_user.is_staff != True:
+            garden = GardenArea.objects.filter(user=current_user)
+        return render(request, 'backstageNet/production/cropcount.html', context={"garden":garden,"farm":farm})
     def post(self,request):
         username = request.user.username
         crop_count = request.POST.get('crop_count')
@@ -2552,7 +2567,7 @@ class CropCount(ListView):
         if crop_id:
             print("修改")
             try:
-                crops =GardenArea.objects.get(name=area)
+                crops =FarmList.objects.get(name=area)
                 crop = Areacrop.objects.filter(id=crop_id).update(
                     cropname=cropname,
                     area=crops,
@@ -2567,7 +2582,7 @@ class CropCount(ListView):
             print("新增")
             #新增
             try:
-                crops =GardenArea.objects.get(name=area)
+                crops =FarmList.objects.get(name=area)
                 Areacrop.objects.create(
                     cropname=cropname,
                     area=crops,
@@ -2592,7 +2607,7 @@ class CropCount_View(ListView):
         gardenid = request.GET.get("ids")
         page = int(request.GET.get("page"))
         dat = []
-        art = GardenArea.objects.filter(id=gardenid)
+        art = FarmList.objects.filter(id=gardenid)
         if art:
             for i in art:
                 art_list = Areacrop.objects.filter(area=i)