去掉没用联系人关联，修改选择题导出

src/main/java/com/key/dwsurvey/service/impl/SurveyAnswerManagerImpl.java

@@ -342,33 +342,50 @@ public class SurveyAnswerManagerImpl extends
 				String quItemId = question.getAnRadio().getQuItemId();
 				List<QuRadio> quRadios=question.getQuRadios();
 				String answerOptionName="";
+				String answerOtherText="";
+				boolean isNote = false;
 				for (QuRadio quRadio : quRadios) {
 					String quRadioId=quRadio.getId();
 					if(quRadioId.equals(quItemId)){
 						answerOptionName=quRadio.getOptionName();
+						if(quRadio.getIsNote()==1){
+							answerOtherText = question.getAnRadio().getOtherText();
+							isNote = true;
+						}
 						break;
 					}
 				}
 				answerOptionName=HtmlUtil.removeTagFromText(answerOptionName);
 				answerOptionName = answerOptionName.replace("&nbsp;"," ");
 				exportUtil.setCell(cellIndex++, answerOptionName);
+
+//				answerOptionName=HtmlUtil.removeTagFromText(answerOptionName);
+				if(isNote) exportUtil.setCell(cellIndex++, answerOtherText);
 			} else if (quType == QuType.CHECKBOX) {// 多选题
 				List<AnCheckbox> anCheckboxs=question.getAnCheckboxs();
 				List<QuCheckbox> checkboxs = question.getQuCheckboxs();
 				for (QuCheckbox quCheckbox : checkboxs) {
 					String quCkId=quCheckbox.getId();
 					String answerOptionName="0";
+					String answerOtherText="";
+					boolean isNote = false;
 					for (AnCheckbox anCheckbox : anCheckboxs) {
 						String anQuItemId=anCheckbox.getQuItemId();
 						if(quCkId.equals(anQuItemId)){
 							answerOptionName=quCheckbox.getOptionName();
 							answerOptionName="1";
+							if(quCheckbox.getIsNote() == 1){
+								answerOtherText = anCheckbox.getOtherText();
+								isNote = true;
+							}
 							break;
 						}
 					}
 					answerOptionName=HtmlUtil.removeTagFromText(answerOptionName);
 					answerOptionName = answerOptionName.replace("&nbsp;"," ");
 					exportUtil.setCell(cellIndex++, answerOptionName);
+
+					if(isNote) exportUtil.setCell(cellIndex++, answerOtherText);
 				}
 			} else if (quType == QuType.FILLBLANK) {// 填空题
 				AnFillblank anFillblank=question.getAnFillblank();
@@ -572,14 +589,27 @@ public class SurveyAnswerManagerImpl extends
 			if (quType == QuType.YESNO) {// 是非题
 				exportUtil.setCell(cellIndex++, titleName);
 			} else if (quType == QuType.RADIO) {// 单选题
+				List<QuRadio> quRadios=question.getQuRadios();
+				boolean isNote = false;
+				for (QuRadio quRadio : quRadios) {
+					if(quRadio.getIsNote()==1){
+						isNote = true;
+					}
+					break;
+				}
+
 				exportUtil.setCell(cellIndex++, titleName);
+				if(isNote) exportUtil.setCell(cellIndex++, titleName + "选项说明");
+
 			} else if (quType == QuType.CHECKBOX) {// 多选题
 				List<QuCheckbox> checkboxs = question.getQuCheckboxs();
 				for (QuCheckbox quCheckbox : checkboxs) {
 					String optionName = quCheckbox.getOptionName();
-
 					optionName=HtmlUtil.removeTagFromText(optionName);
-					exportUtil.setCell(cellIndex++,titleName+ "－"+optionName );
+					exportUtil.setCell(cellIndex++,titleName + "－" + optionName );
+					if(quCheckbox.getIsNote()==1){
+						exportUtil.setCell(cellIndex++, titleName+ "－" + optionName  + "－选项说明");
+					}
 				}
 			} else if (quType == QuType.FILLBLANK) {// 填空题
 				exportUtil.setCell(cellIndex++, titleName);

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

@@ -2444,7 +2444,7 @@
 					<!-- <li><input type="checkbox" name="quChage"><label>切换为多选</label> </li> -->
 					<li><label><input type="checkbox" name="setIsRequired"  >此题必答</label> </li>
 					<li class="optionAutoOrder"><label><input type="checkbox" name="setRandOrder" >选择随机排列</label> </li>
-					<li class="contactsAttrLi"><label><input type="checkbox" name="setAutoContacts" >关联到联系人属性</label> </li>
+					<li class="contactsAttrLi" style="display: none;"><label><input type="checkbox" name="setAutoContacts" >关联到联系人属性</label> </li>
 					<li class="contactsFieldLi"><label>用户填写的内容，会成为联系人的</label>
 					<select class="contacts_range" name="setContactsField"  style="width:120px;">
 					<option value="1">姓名</option>

src/main/webapp/js/dw/dw-design-init.js

@@ -1753,7 +1753,7 @@ function showDialog(thDialogObj){
 
 		//单选，多选，填空题情况下才启用关联到联系设置项
 		if((quType=="RADIO" || quType=="CHECKBOX" || quType=="FILLBLANK")){
-			$("#dwCommonDialog .contactsAttrLi").show();
+			// $("#dwCommonDialog .contactsAttrLi").show();
 			if( contactsAttr==1){
 				$("#dwCommonDialog input[name='setAutoContacts']").prop("checked",true);
 				$("#dwCommonDialog .contactsFieldLi").show();

src/main/webapp/js/dw/html/collectset.html

@@ -21,7 +21,7 @@
 						</div>
 					</div>
 					<div style="clear: both;"></div>
-					<div class="p_DialogContent">
+					<div class="p_DialogContent" style="display: none;">
 						<div class="p_DialogContentTitle">答完后</div>
 						<div class="p_DialogContentRoot">
 								<div class="p_DialogContentItem"><label><input type="checkbox" name="showShareSurvey" value="1"> 显示分享按钮，分享答题链接到更多社交网站</label></div>