下拉选择题设置，升级MySql驱动包

pom.xml

@@ -110,7 +110,8 @@
 	<dependency>
 		<groupId>mysql</groupId>
 		<artifactId>mysql-connector-java</artifactId>
-		<version>5.1.6</version>
+		<version>8.0.19</version>
+		<!-- 5.1.6 , 5.1.49, 8.0.17-->
 	</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.apache.velocity/velocity -->

src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey-m.jsp

@@ -57,6 +57,7 @@
 								<input type="hidden" class="orderById" value="${en.orderById }"/>
 								<input type="hidden" class="isRequired" value="${en.isRequired }">
 								<input type="hidden" class="answerTag" value="0" >
+								<input type="hidden" class="hv" value="${en.hv}" >
 								<div class="quLogicInputCase">
 								<c:forEach items="${en.questionLogics }" var="quLogicEn" varStatus="logicSts">
 									<div class="quLogicItem quLogicItem_${logicSts.count }">

src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey-p.jsp

@@ -121,6 +121,7 @@ label.error{
 								<input type="hidden" class="orderById" value="${en.orderById }"/>
 								<input type="hidden" class="isRequired" value="${en.isRequired }">
 								<input type="hidden" class="answerTag" value="0" >
+								<input type="hidden" class="hv" value="${en.hv}" >
 								<div class="quLogicInputCase">
 								<c:forEach items="${en.questionLogics }" var="quLogicEn" varStatus="logicSts">
 									<div class="quLogicItem quLogicItem_${logicSts.count }">

src/main/webapp/js/common/ans-m.js

@@ -159,7 +159,17 @@ $(document).ready(function(){
                 return true;
             }
             if(quType==="RADIO"){
-                validateStatus=quItemBody.find("input[type='radio']:checked")[0];
+                var hv = quItemBody.find(".hv").val();
+                if(hv=="4"){
+                    var radioSelectVal = quItemBody.find(".radioSelect").val();
+                    if(radioSelectVal!="" && radioSelectVal!="0"){
+                        validateStatus = true;
+                    }else{
+                        validateStatus = false;
+                    }
+                }else{
+                    validateStatus=quItemBody.find("input[type='radio']:checked")[0];
+                }
             }else if(quType==="CHECKBOX"){
                 validateStatus=quItemBody.find("input[type='checkbox']:checked")[0];
             }else if(quType==="FILLBLANK"){
@@ -234,6 +244,25 @@ $(document).ready(function(){
         return false;
     });
 
+    $(".radioSelect").change(function(){
+        var thVal = $(this).val();
+        var thName = $(this).attr("name");
+        var quCoItemUlLi = $(this).parents("li.quCoItemUlLi");
+        var quItemInputCase= quCoItemUlLi.find(".quItemInputCase[itemid='"+thVal+"']");
+        var isNote = quItemInputCase.find(".isNote").val();
+        if(isNote=="1"){
+            quCoItemUlLi.find(".dwQuOptionItemNote").hide();
+            var dwQuOptionItemNote = quCoItemUlLi.find(".dwQuOptionItemNote[name='text_"+thName+"_"+thVal+"']");
+            dwQuOptionItemNote.show();
+        }else{
+            quCoItemUlLi.find(".dwQuOptionItemNote").hide();
+        }
+        var thObj = $(this);
+        var quItemBody = $(this).parents(".li_surveyQuItemBody");
+        validateCheck(quItemBody,false);
+        return false;
+    });
+
     $("#dwSurveyQuContent .dwQuOptionItemContent").unbind();
     $("#dwSurveyQuContent .dwQuOptionItemContent").click(function(){
         clickItem($(this));

src/main/webapp/js/common/ans-p.js

@@ -250,7 +250,17 @@ $(document).ready(function(){
             }
 
             if(quType==="RADIO"){
-                validateStatus=quItemBody.find("input[type='radio']:checked")[0];
+                var hv = quItemBody.find(".hv").val();
+                if(hv=="4" && quType ==="RADIO"){
+                    var radioSelectVal = quItemBody.find(".radioSelect").val();
+                    if(radioSelectVal!="" && radioSelectVal!="0"){
+                        validateStatus = true;
+                    }else{
+                        validateStatus = false;
+                    }
+                }else{
+                    validateStatus=quItemBody.find("input[type='radio']:checked")[0];
+                }
             }else if(quType==="CHECKBOX"){
                 validateStatus=quItemBody.find("input[type='checkbox']:checked")[0];
             }else if(quType==="FILLBLANK"){
@@ -331,6 +341,26 @@ $(document).ready(function(){
         hidQuItemBody.find(".answerTag").attr("disabled",true);
     });
 
+    $(".radioSelect").change(function(){
+        var thVal = $(this).val();
+        var thName = $(this).attr("name");
+        var quCoItemUlLi = $(this).parents("li.quCoItemUlLi");
+        var quItemInputCase= quCoItemUlLi.find(".quItemInputCase[itemid='"+thVal+"']");
+        var isNote = quItemInputCase.find(".isNote").val();
+
+        if(isNote=="1"){
+            quCoItemUlLi.find(".dwQuOptionItemNote").hide();
+            var dwQuOptionItemNote = quCoItemUlLi.find(".dwQuOptionItemNote[name='text_"+thName+"_"+thVal+"']");
+            dwQuOptionItemNote.show();
+        }else{
+            quCoItemUlLi.find(".dwQuOptionItemNote").hide();
+        }
+        var thObj = $(this);
+        answerProgressbar(thObj);
+        var quItemBody = $(this).parents(".li_surveyQuItemBody");
+        validateCheck(quItemBody,false);
+        return false;
+    });
 
     $(".dwQuOptionItemContent").click(function(){
         var thObj=$(this);
@@ -388,12 +418,22 @@ $(document).ready(function(){
         var quType=quItemBody.find(".quType").val();
 
         if(quType==="RADIO"){
-            //quItemBody.find(".answerTag").val(1);
-            var checks=quItemBody.find("input[type='radio']:checked");
-            if(checks[0]){
-                quItemBody.find(".answerTag").val(1);
+            var hv = quItemBody.find(".hv").val();
+            if(hv=="4"){
+                var radioSelectVal = quItemBody.find(".radioSelect").val();
+                if(radioSelectVal!=""){
+                    quItemBody.find(".answerTag").val(1);
+                }else{
+                    quItemBody.find(".answerTag").val(0);
+                }
             }else{
-                quItemBody.find(".answerTag").val(0);
+                //quItemBody.find(".answerTag").val(1);
+                var checks=quItemBody.find("input[type='radio']:checked");
+                if(checks[0]){
+                    quItemBody.find(".answerTag").val(1);
+                }else{
+                    quItemBody.find(".answerTag").val(0);
+                }
             }
         }else if(quType=="CHECKBOX"){
             var checks=quItemBody.find("input[type='checkbox']:checked");