选项后填空

src/main/java/com/key/dwsurvey/action/nologin/ResponseAction.java

@@ -367,19 +367,10 @@ public class ResponseAction extends ActionSupport {
 		quMaps.put("yesnoMaps", yesnoMaps);
 		// 单选题quradio_id id_value
 		Map<String, Object> radioMaps = WebUtils.getParametersStartingWith(
-				request, "qu_" + QuType.RADIO + "_");
-		quMaps.put("radioMaps", radioMaps);
+				request, "qu_"+QuType.RADIO + "_");
 		// 多选题qucheckbox_id id_value,id_value
 		Map<String, Object> checkboxMaps = WebUtils.getParametersStartingWith(
-				request, "qu_" + QuType.CHECKBOX + "_");
-		// 得到每一个子项
-		for (String key : checkboxMaps.keySet()) {
-			String dfillValue = checkboxMaps.get(key).toString();
-			Map<String, Object> map = WebUtils.getParametersStartingWith(
-					request, dfillValue);
-			checkboxMaps.put(key, map);
-		}
-		quMaps.put("checkboxMaps", checkboxMaps);
+				request, "qu_"+QuType.CHECKBOX + "_");
 		// 填空题qufillblank_id value
 		Map<String, Object> fillblankMaps = WebUtils.getParametersStartingWith(
 				request, "qu_" + QuType.FILLBLANK + "_");
@@ -453,7 +444,6 @@ public class ResponseAction extends ActionSupport {
 			scoreMaps.put(key, map);
 		}
 		quMaps.put("scoreMaps", scoreMaps);
-
 		// 排序题
 		Map<String, Object> quOrderMaps = WebUtils.getParametersStartingWith(
 				request, "qu_" + QuType.ORDERQU + "_");
@@ -464,7 +454,6 @@ public class ResponseAction extends ActionSupport {
 			quOrderMaps.put(key, map);
 		}
 		quMaps.put("quOrderMaps", quOrderMaps);
-
 		// 矩阵单选题
 		Map<String, Object> chenRadioMaps = WebUtils.getParametersStartingWith(
 				request, "qu_" + QuType.CHENRADIO + "_");
@@ -527,7 +516,36 @@ public class ResponseAction extends ActionSupport {
 			chenFbkMaps.put(key, map);
 		}
 		quMaps.put("chenFbkMaps", chenFbkMaps);
-
+		//子级
+		for (String key:radioMaps.keySet()) {
+			String enId = key;
+			String quItemId = radioMaps.get(key).toString();
+			String otherText = Struts2Utils.getParameter("text_qu_"
+					+ QuType.RADIO + "_" + enId + "_" + quItemId);
+			AnRadio anRadio = new AnRadio();
+			anRadio.setQuId(enId);
+			anRadio.setQuItemId(quItemId);
+			anRadio.setOtherText(otherText);
+			radioMaps.put(key, anRadio);
+		}
+		quMaps.put("compRadioMaps", radioMaps);
+		// 子级
+		for (String key : checkboxMaps.keySet()) {
+			String dfillValue = checkboxMaps.get(key).toString();
+			Map<String, Object> map = WebUtils.getParametersStartingWith(
+					request, dfillValue);
+			for (String key2 : map.keySet()) {
+				String quItemId = map.get(key2).toString();
+				String otherText = Struts2Utils.getParameter("text_"
+						+ dfillValue + quItemId);
+				AnCheckbox anCheckbox = new AnCheckbox();
+				anCheckbox.setQuItemId(quItemId);
+				anCheckbox.setOtherText(otherText);
+				map.put(key2, anCheckbox);
+			}
+			checkboxMaps.put(key, map);
+		}
+		quMaps.put("compCheckboxMaps", checkboxMaps);
 		// 复合矩阵单选题
 		Map<String, Object> chenCompChenRadioMaps = WebUtils
 				.getParametersStartingWith(request, "qu_"
@@ -546,7 +564,6 @@ public class ResponseAction extends ActionSupport {
 			chenCompChenRadioMaps.put(key, map);
 		}
 		quMaps.put("compChenRadioMaps", chenCompChenRadioMaps);
-
 		return quMaps;
 	}
 

src/main/java/com/key/dwsurvey/dao/impl/SurveyAnswerDaoImpl.java

@@ -422,6 +422,7 @@ public class SurveyAnswerDaoImpl extends BaseDaoImpl<SurveyAnswer, String> imple
 		String surveyAnswerId=surveyAnswer.getId();
 		
 		int answerQuCount=0;
+		if (checkboxMaps!=null)
 		for (String key : checkboxMaps.keySet()) {
 			String quId=key;
 			Map<String, Object> map=(Map<String, Object>) checkboxMaps.get(key);
@@ -502,13 +503,14 @@ public class SurveyAnswerDaoImpl extends BaseDaoImpl<SurveyAnswer, String> imple
 		String surveyId=surveyAnswer.getSurveyId();
 		String surveyAnswerId=surveyAnswer.getId();
 		int answerQuCount=0;
+		if (radioMaps!=null)
 		for (String key : radioMaps.keySet()) {
 			answerQuCount++;
 			String quId=key;
 			String quItemId=radioMaps.get(key).toString();
 			AnRadio anRadio=new AnRadio(surveyId,surveyAnswerId,quId,quItemId);
 			session.save(anRadio);
-		}		
+		}
 		return answerQuCount;
 	}
 

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

@@ -1125,6 +1125,7 @@ label.error{
 															<div class="dwQuOptionItemContent">
 																<label class="dwRedioStyle dwQuInputLabel" ></label>
 																<input type="radio" name="qu_${en.quType }_${en.id }" value="${en.quRadios[quOptionIndex].id }" ><label style="width:${600/en.cellCount-10 }px;" class="editAble quCoOptionEdit quCoOptionPadding">${en.quRadios[quOptionIndex].optionName }</label>
+																<input type='text' class='inputSytle_1'  style="width:200px;padding:5px;${item.isNote eq 1 ? '':'display: none;'}"  name="text_qu_${en.quType }_${en.id }_${en.quRadios[quOptionIndex].id }" />
 															</div>
 														</c:when>
 														<c:otherwise><div class="emptyTd"></div></c:otherwise>
@@ -1142,6 +1143,7 @@ label.error{
 													<div class="dwQuOptionItemContent">
 													<label class="dwRedioStyle dwQuInputLabel" ></label>
 													<input type="radio" name="qu_${en.quType }_${en.id }" value="${item.id }"><label class="editAble quCoOptionEdit quCoOptionPadding">${item.optionName }</label>
+														<input type='text' class='inputSytle_1'  style="width:200px;padding:5px;${item.isNote eq 1 ? '':'display: none;'}"  name="text_qu_${en.quType }_${en.id }_${item.id }"  />
 													</div>
 												</li>
 												<!-- <li><select> <option>可想而知</option> </select> </li> -->
@@ -1155,6 +1157,7 @@ label.error{
 													<div class="dwQuOptionItemContent">
 													<label class="dwRedioStyle dwQuInputLabel" ></label>
 													<input type="radio" name="qu_${en.quType }_${en.id }" value="${item.id }" ><label class="editAble quCoOptionEdit quCoOptionPadding">${item.optionName }</label>
+														<input type='text' class='inputSytle_1'  style="width:200px;padding:5px;${item.isNote eq 1 ? '':'display: none;'}"   name="text_qu_${en.quType }_${en.id }_${item.id }"  />
 													</div>
 												</li>
 												<!-- <li><select> <option>可想而知</option> </select> </li> -->
@@ -1214,6 +1217,7 @@ label.error{
 														<div class="dwQuOptionItemContent">
 																<label class="dwCheckboxStyle dwQuInputLabel" ></label>
 																<input type="checkbox" name="tag_qu_${en.quType }_${en.id }_${en.quCheckboxs[quOptionIndex].id }"  value="${en.quCheckboxs[quOptionIndex].id }" ><label style="width:${600/en.cellCount-10 }px;" class="editAble quCoOptionEdit quCoOptionPadding">${en.quCheckboxs[quOptionIndex].optionName }</label>
+															<input type='text' class='inputSytle_1'  style="width:200px;padding:5px;${item.isNote eq 1 ? '':'display: none;'}"  name="text_tag_qu_${en.quType }_${en.id }_${en.quCheckboxs[quOptionIndex].id }"  />
 														</div>
 														</c:when>
 														<c:otherwise><div class="emptyTd"></div></c:otherwise>
@@ -1231,6 +1235,7 @@ label.error{
 													<div class="dwQuOptionItemContent">
 														<label class="dwCheckboxStyle dwQuInputLabel" ></label>
 														<input type="checkbox" name="tag_qu_${en.quType }_${en.id }_${item.id }"  value="${item.id }" ><label class="editAble quCoOptionEdit quCoOptionPadding">${item.optionName }</label>
+														<input type='text' class='inputSytle_1'  style="width:200px;padding:5px;${item.isNote eq 1 ? '':'display: none;'}"  name="text_tag_qu_${en.quType }_${en.id }_${en.quCheckboxs[quOptionIndex].id }" />
 													</div>
 												</li>
 												<!-- <li><select> <option>可想而知</option> </select> </li> -->
@@ -1244,6 +1249,7 @@ label.error{
 												<div class="dwQuOptionItemContent">
 													<label class="dwCheckboxStyle dwQuInputLabel" ></label>
 													<input type="checkbox" name="tag_qu_${en.quType }_${en.id }_${item.id }"  value="${item.id }" ><label class="editAble quCoOptionEdit quCoOptionPadding">${item.optionName }</label>
+													<input type='text' class='inputSytle_1'  style="width:200px;padding:5px;${item.isNote eq 1 ? '':'display: none;'}"  name="text_tag_qu_${en.quType }_${en.id }_${en.quCheckboxs[quOptionIndex].id }" />
 												</div>
 												</li>
 												<!-- <li><select> <option>可想而知</option> </select> </li> -->

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

@@ -1058,6 +1058,7 @@ $(document).ready(function(){
 																<div class="dwQuOptionItemContent">
 																<label class="dwRedioStyle dwQuInputLabel" ></label>
 																<input type="radio" ><label style="width:${600/en.cellCount-10 }px;" class="editAble quCoOptionEdit quCoOptionPadding">${en.quRadios[quOptionIndex].optionName }</label>
+																	<input type='text' class='optionInpText'  style="width:200px;padding:5px;${item.isNote eq 1 ? '':'display: none;'}"/>
 																<div class="quItemInputCase"><input type="hidden" name="quItemId" value="${en.quRadios[quOptionIndex].id }"><input type="hidden" name="quItemSaveTag" value="1"></div>
 																</div>
 														</c:when>
@@ -1076,6 +1077,7 @@ $(document).ready(function(){
 													<div class="dwQuOptionItemContent">
 													<label class="dwRedioStyle dwQuInputLabel" ></label>
 													<input type="radio"><label class="editAble quCoOptionEdit quCoOptionPadding">${item.optionName }</label>
+														<input type='text' class='optionInpText'  style="width:200px;padding:5px;${item.isNote eq 1 ? '':'display: none;'}"/>
 													<div class="quItemInputCase"><input type="hidden" name="quItemId" value="${item.id }"><input type="hidden" name="quItemSaveTag" value="1"></div>
 													</div>
 												</li>
@@ -1090,6 +1092,7 @@ $(document).ready(function(){
 													<div class="dwQuOptionItemContent">
 													<label class="dwRedioStyle dwQuInputLabel" ></label>
 													<input type="radio"><label class="editAble quCoOptionEdit quCoOptionPadding">${item.optionName }</label>
+														<input type='text' class='optionInpText'  style="width:200px;padding:5px;${item.isNote eq 1 ? '':'display: none;'}"/>
 													<div class="quItemInputCase"><input type="hidden" name="quItemId" value="${item.id }"><input type="hidden" name="quItemSaveTag" value="1"></div>
 													</div>
 												</li>
@@ -1154,6 +1157,7 @@ $(document).ready(function(){
 														<div class="dwQuOptionItemContent">
 															<label class="dwCheckboxStyle dwQuInputLabel" ></label>
 															<input type="checkbox"><label style="width:${600/en.cellCount-10 }px;" class="editAble quCoOptionEdit quCoOptionPadding">${en.quCheckboxs[quOptionIndex].optionName }</label>
+															<input type='text' class='optionInpText'  style="width:200px;padding:5px;${item.isNote eq 1 ? '':'display: none;'}"/>
 															<div class="quItemInputCase"><input type="hidden" name="quItemId" value="${en.quCheckboxs[quOptionIndex].id }"><input type="hidden" name="quItemSaveTag" value="1"></div>
 														</div>
 														</c:when>
@@ -1172,6 +1176,7 @@ $(document).ready(function(){
 												<div class="dwQuOptionItemContent">
 													<label class="dwCheckboxStyle dwQuInputLabel" ></label>
 													<input type="checkbox"><label class="editAble quCoOptionEdit quCoOptionPadding">${item.optionName }</label>
+													<input type='text' class='optionInpText'  style="width:200px;padding:5px;${item.isNote eq 1 ? '':'display: none;'}"/>
 													<div class="quItemInputCase"><input type="hidden" name="quItemId" value="${item.id }"><input type="hidden" name="quItemSaveTag" value="1"></div>
 												</div>
 												</li>
@@ -1186,6 +1191,7 @@ $(document).ready(function(){
 												<div class="dwQuOptionItemContent">
 													<label class="dwCheckboxStyle dwQuInputLabel" ></label>
 													<input type="checkbox"><label class="editAble quCoOptionEdit quCoOptionPadding">${item.optionName }</label>
+													<input type='text' class='optionInpText'  style="width:200px;padding:5px;${item.isNote eq 1 ? '':'display: none;'}"/>
 													<div class="quItemInputCase"><input type="hidden" name="quItemId" value="${item.id }"><input type="hidden" name="quItemSaveTag" value="1"></div>
 												</div>
 												</li>

src/main/webapp/css/preview-dev.css

@@ -1722,7 +1722,10 @@ table.quCoChenTable tr td label{
 .dwQuOptionItemContent label{
 	cursor: pointer!important;
 }
-.dwQuOptionItemContent input{
+/*.dwQuOptionItemContent input{
+	display: none;
+}*/
+.dwQuOptionItemContent input[type='radio'],.dwQuOptionItemContent input[type='checkbox']{
 	display: none;
 }
 .dwQuOptionItemContent .dwQuInputLabel{