From 6ffa26bc3ac5a02211c25bc5e0268952ddf67632 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Sat, 27 Jul 2019 11:30:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=9A=84=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_votes_controller.rb |  8 ------
 app/controllers/polls_controller.rb      | 32 ++++++++++++++++++------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/app/controllers/poll_votes_controller.rb b/app/controllers/poll_votes_controller.rb
index b376b870f..b1191d8ea 100644
--- a/app/controllers/poll_votes_controller.rb
+++ b/app/controllers/poll_votes_controller.rb
@@ -147,17 +147,9 @@ class PollVotesController < ApplicationController
       else
         question_max_choices = 0
       end
-      if @poll_question.min_choices.present?
-        question_min_choices = @poll_question.min_choices
-      else
-        question_min_choices = 0
-      end
       if question_max_choices > 0 && (user_vote_count > question_max_choices)
         normal_status(-1,"多选题答案超过最大限制！")
       end
-      if question_min_choices > 0 && (user_vote_count < question_min_choices)
-        normal_status(-1,"多选题答题不得少于最小限制！")
-      end
     elsif (poll_user.present? && poll_user.commit_status == 1) || poll_user_status == 3
       normal_status(-1,"已提交/已结束的问卷不允许修改！")
     end
diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index f5003a0c7..a89544669 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -896,13 +896,31 @@ class PollsController < ApplicationController
   def commit_poll
     ActiveRecord::Base.transaction do
       begin
-        poll_user_current = @poll.poll_users.find_by_group_ids(current_user.id).first
-        poll_user_params = {
-            :commit_status => 1,
-            :end_at => Time.now
-        }
-        poll_user_current.update_attributes(poll_user_params)
-        normal_status(0, "问卷提交成功！")
+        @poll_multi_questions = @poll.poll_questions.where(question_type:2).select(:id,:max_choices,:min_choices,:question_number)
+        error_question = []
+        @poll_multi_questions.each do |q|
+          poll_user_votes = current_user.poll_votes.where(question_id:q.id)&.size
+          if q.max_choices.present? && (poll_user_votes > q.max_choices)
+            error_messages = "第#{q.question_number}题：超过最大选项限制"
+          elsif q.min_choices.present? && (poll_user_votes < q.min_choices)
+            error_messages = "第#{q.question_number}题：不得少于最小选项限制"
+          else
+            error_messages = nil
+          end
+          error_question.push(error_messages)
+        end
+        error_question = error_question.reject(&:blank?)
+        if error_question.reject(&:blank?).length > 0
+          normal_status(-1, "#{error_question.join("\n")}")
+        else
+          poll_user_current = @poll.poll_users.find_by_group_ids(current_user.id).first
+          poll_user_params = {
+              :commit_status => 1,
+              :end_at => Time.now
+          }
+          poll_user_current.update_attributes(poll_user_params)
+          normal_status(0, "问卷提交成功！")
+        end
           ## 需添加发送消息的接口，稍后添加
       rescue Exception => e
         uid_logger_error(e.message)