فهرست منبع

四季采摘接口增加参数

yf_ymm 5 سال پیش
والد
کامیت
b17b749e1d
2فایلهای تغییر یافته به همراه10 افزوده شده و 1 حذف شده
  1. 4 0
      apps/AppInfo/models.py
  2. 6 1
      apps/Equipment/views.py

+ 4 - 0
apps/AppInfo/models.py

@@ -459,7 +459,11 @@ class FarmList(models.Model):
 # 采摘发布
 class Pick_Pub(models.Model):
     farm = models.ForeignKey(FarmList, blank=True, null=True, verbose_name=u'所属农场',related_name='farms')
+    pick_s = models.DateTimeField(u'采摘开始', blank=True, null=True)
+    pick_e = models.DateTimeField(u'采摘结束', blank=True, null=True)
     name = models.CharField(u'采摘名称', max_length=20, blank=True, null=True)
+    addr = models.CharField(u'种植地址', max_length=20, blank=True, null=True)
+    scale = models.CharField(u'种植规模', max_length=20, blank=True, null=True)
     company = models.CharField(u'采摘企业', max_length=20, blank=True, null=True)
     pick_img = models.CharField(u'农场图片', max_length=200, blank=True, null=True)
     upl_time = models.CharField(u'采摘时间', max_length=200,blank=True, null=True)

+ 6 - 1
apps/Equipment/views.py

@@ -1119,6 +1119,11 @@ class Garden_Pub(ListView):
         farm = request.POST.get('farm')
         name = request.POST.get('name')
         time = request.POST.get('time')
+        pick_s = request.POST.get('start')
+        pick_e = request.POST.get('end')
+        # 规模
+        scale = request.POST.get('scale')
+        addr = request.POST.get('addr')
         company = request.POST.get('company')
         pick_img = request.POST.get('img_url')
         garden_id = request.POST.get('id')
@@ -1127,7 +1132,7 @@ class Garden_Pub(ListView):
         if garden_id:
             if Pick_Pub.objects.filter(id=garden_id).exists():
                 farm_obj = FarmList.objects.get(name=farm)
-                Pick_Pub.objects.filter(id=garden_id).update(farm=farm_obj,name=name,company=company,pick_img=pick_img,upl_time=time)
+                Pick_Pub.objects.filter(id=garden_id).update(pick_s=pick_s,pick_e=pick_s,scale=scale,addr=addr,farm=farm_obj,name=name,company=company,pick_img=pick_img,upl_time=time)
                 data = "1"
             else:
                 data = "0"