Merge remote-tracking branch 'remotes/origin/ming' into test

Controller/SurveysController.py

@@ -126,9 +126,9 @@ class SurveysView(View):
                     topicD = request_dict.get('topicD', None)
                     topicF = request_dict.get('topicF', None)
                     createdTime = int(time.time())
-                    answer = CloudVodSurveysAnswer(title_id=survey_title.id, user_id=userId, ip=ip, answer_1=int(score),
-                                                   answer_2=topicA,
-                                                   answer_3=topicB, answer_4=topicC, answer_5=topicD, answer_6=topicF,
+                    answer = CloudVodSurveysAnswer(title_id=survey_title.id, user_id=userId, ip=ip, answer1=int(score),
+                                                   answer2=topicA,
+                                                   answer3=topicB, answer4=topicC, answer5=topicD, answer6=topicF,
                                                    created_time=createdTime, country_name=country_name)
                     answer.save()
             return response.json(0)

Model/models.py

@@ -2001,14 +2001,12 @@ class CloudVodSurveysAnswer(models.Model):
     title = models.ForeignKey(SurveysTitle, to_field='id', default='', on_delete=models.CASCADE, verbose_name='关联题目表ID')
     user = models.ForeignKey(Device_User, to_field='userID', default='', on_delete=models.CASCADE,
                              verbose_name='关联用户表ID')
-    answer_1 = models.IntegerField(verbose_name='答案1 （分数）', default='')
-    answer_2 = models.CharField(max_length=500, blank=True, verbose_name='答案2', default='')
-    answer_3 = models.CharField(max_length=500, blank=True, verbose_name='答案3', default='')
-    answer_4 = models.CharField(max_length=500, blank=True, verbose_name='答案4', default='')
-    answer_5 = models.CharField(max_length=500, blank=True, verbose_name='答案5', default='')
-    answer_6 = models.CharField(max_length=500, blank=True, verbose_name='答案6', default='')
-    answer_7 = models.CharField(max_length=500, blank=True, verbose_name='答案6', default='')
-    answer_8 = models.CharField(max_length=500, blank=True, verbose_name='答案6', default='')
+    answer1 = models.IntegerField(max_length=10, verbose_name='答案1 （分数）', default='')
+    answer2 = models.CharField(max_length=500, blank=True, verbose_name='答案2', default='')
+    answer3 = models.CharField(max_length=500, blank=True, verbose_name='答案3', default='')
+    answer4 = models.CharField(max_length=500, blank=True, verbose_name='答案4', default='')
+    answer5 = models.CharField(max_length=500, blank=True, verbose_name='答案5', default='')
+    answer6 = models.CharField(max_length=500, blank=True, verbose_name='答案6', default='')
     ip = models.CharField(max_length=32, default='', db_index=True, blank=True, verbose_name=u'访问ip地址')
     country_name = models.CharField(max_length=20, default='', verbose_name='国家名')
     created_time = models.IntegerField(default=0, verbose_name='创建时间')