修改大家反馈的代码逻辑问题

src/main/java/com/key/dwsurvey/action/QuCheckboxAction.java

@@ -48,7 +48,6 @@ public class QuCheckboxAction extends ActionSupport{
 			questionManager.save(entity);
 			String resultJson=buildResultJson(entity);
 			response.getWriter().write(resultJson);
-			//返回各部分ID
 		}catch (Exception e) {
 			e.printStackTrace();
 			response.getWriter().write("error");
@@ -62,16 +61,12 @@ public class QuCheckboxAction extends ActionSupport{
 		String quTitle=request.getParameter("quTitle");
 		String orderById=request.getParameter("orderById");
 		String tag=request.getParameter("tag");
-		//isRequired 是否必选
 		String isRequired=request.getParameter("isRequired");
-		//hv 1水平显示 2垂直显示
 		String hv=request.getParameter("hv");
-		//randOrder 选项随机排列
 		String randOrder=request.getParameter("randOrder");
 		String cellCount=request.getParameter("cellCount");
 		String contactsAttr=request.getParameter("contactsAttr");
 		String contactsField=request.getParameter("contactsField");
-		
 		if("".equals(quId)){
 			quId=null;
 		}
@@ -84,21 +79,17 @@ public class QuCheckboxAction extends ActionSupport{
 		entity.setOrderById(Integer.parseInt(orderById));
 		entity.setTag(Integer.parseInt(tag));
 		entity.setQuType(QuType.CHECKBOX);
-		//参数
 		isRequired=(isRequired==null || "".equals(isRequired))?"0":isRequired;
 		hv=(hv==null || "".equals(hv))?"0":hv;
 		randOrder=(randOrder==null || "".equals(randOrder))?"0":randOrder;
 		cellCount=(cellCount==null || "".equals(cellCount))?"0":cellCount;
-				
 		contactsAttr=(contactsAttr==null || "".equals(contactsAttr))?"0":contactsAttr;
 		entity.setContactsAttr(Integer.parseInt(contactsAttr));
 		entity.setContactsField(contactsField);
-		
 		entity.setIsRequired(Integer.parseInt(isRequired));
 		entity.setHv(Integer.parseInt(hv));
 		entity.setRandOrder(Integer.parseInt(randOrder));
 		entity.setCellCount(Integer.parseInt(cellCount));
-		//quOption
 		Map<String, Object> optionNameMap=WebUtils.getParametersStartingWith(request, "optionValue_");
 		List<QuCheckbox> quCheckboxs=new ArrayList<QuCheckbox>();
 		for (String key : optionNameMap.keySet()) {
@@ -118,19 +109,15 @@ public class QuCheckboxAction extends ActionSupport{
 			optionNameValue=URLDecoder.decode(optionNameValue,"utf-8");
 			quCheckbox.setOptionName(optionNameValue);
 			quCheckbox.setOrderById(Integer.parseInt(key));
-			
 			isNote=(isNote==null || "".equals(isNote))?"0":isNote;
 			checkType=(checkType==null || "".equals(checkType))?"NO":checkType;
 			isRequiredFill=(isRequiredFill==null || "".equals(isRequiredFill))?"0":isRequiredFill;
 			quCheckbox.setIsNote(Integer.parseInt(isNote));
 			quCheckbox.setCheckType(CheckType.valueOf(checkType));
 			quCheckbox.setIsRequiredFill(Integer.parseInt(isRequiredFill));
-			
 			quCheckboxs.add(quCheckbox);
 		}
 		entity.setQuCheckboxs(quCheckboxs);
-
-		//逻辑选项设置
 		Map<String, Object> quLogicIdMap=WebUtils.getParametersStartingWith(request, "quLogicId_");
 		List<QuestionLogic> quLogics=new ArrayList<QuestionLogic>();
 		for (String key : quLogicIdMap.keySet()) {
@@ -139,12 +126,8 @@ public class QuCheckboxAction extends ActionSupport{
 			String visibility=request.getParameter("visibility_"+key);
 			String logicType=request.getParameter("logicType_"+key);
 			Object quLogicId=quLogicIdMap.get(key);
-			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():"";
-
+			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():null;
 			QuestionLogic quLogic=new QuestionLogic();
-			if("".equals(quLogic)){
-				quLogic=null;
-			}
 			quLogic.setId(quLogicIdValue);
 			quLogic.setCgQuItemId(cgQuItemId);
 			quLogic.setSkQuId(skQuId);
@@ -152,10 +135,8 @@ public class QuCheckboxAction extends ActionSupport{
 			quLogic.setTitle(key);
 			quLogic.setLogicType(logicType);
 			quLogics.add(quLogic);
-
 		}
 		entity.setQuestionLogics(quLogics);
-		
 		return entity;
 	}
 	
@@ -176,7 +157,6 @@ public class QuCheckboxAction extends ActionSupport{
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]");
-
 		strBuf.append(",quLogics:[");
 		List<QuestionLogic> questionLogics=entity.getQuestionLogics();
 		if(questionLogics!=null){

src/main/java/com/key/dwsurvey/action/QuChenAction.java

@@ -65,14 +65,10 @@ public class QuChenAction extends ActionSupport{
 		String orderById=request.getParameter("orderById");
 		String tag=request.getParameter("tag");
 		String quType=request.getParameter("quType");
-		//isRequired 是否必选
 		String isRequired=request.getParameter("isRequired");
-		//hv 1水平显示 2垂直显示
 		String hv=request.getParameter("hv");
-		//randOrder 选项随机排列
 		String randOrder=request.getParameter("randOrder");
 		String cellCount=request.getParameter("cellCount");
-		
 		if("".equals(quId)){
 			quId=null;
 		}
@@ -84,19 +80,15 @@ public class QuChenAction extends ActionSupport{
 		}
 		entity.setOrderById(Integer.parseInt(orderById));
 		entity.setTag(Integer.parseInt(tag));
-		//quType
 		entity.setQuType(QuType.valueOf(quType));
-		//参数
 		isRequired=(isRequired==null || "".equals(isRequired))?"0":isRequired;
 		hv=(hv==null || "".equals(hv))?"0":hv;
 		randOrder=(randOrder==null || "".equals(randOrder))?"0":randOrder;
 		cellCount=(cellCount==null || "".equals(cellCount))?"0":cellCount;
-		
 		entity.setIsRequired(Integer.parseInt(isRequired));
 		entity.setHv(Integer.parseInt(hv));
 		entity.setRandOrder(Integer.parseInt(randOrder));
 		entity.setCellCount(Integer.parseInt(cellCount));
-		//quChenColumn列选项
 		Map<String, Object> columnOptionNameMaps=WebUtils.getParametersStartingWith(request, "columnValue_");
 		List<QuChenColumn> quChenColumns=new ArrayList<QuChenColumn>();
 		for (String key : columnOptionNameMaps.keySet()) {
@@ -114,8 +106,6 @@ public class QuChenAction extends ActionSupport{
 			quChenColumns.add(quChenColumn);
 		}
 		entity.setColumns(quChenColumns);
-		
-		//quChenRow行选项
 		Map<String, Object> rowOptionNameMaps=WebUtils.getParametersStartingWith(request, "rowValue_");
 		List<QuChenRow> quChenRows=new ArrayList<QuChenRow>();
 		for (String key : rowOptionNameMaps.keySet()) {
@@ -133,8 +123,6 @@ public class QuChenAction extends ActionSupport{
 			quChenRows.add(quChenRow);
 		}
 		entity.setRows(quChenRows);
-		
-		//逻辑选项设置
 		Map<String, Object> quLogicIdMap=WebUtils.getParametersStartingWith(request, "quLogicId_");
 		List<QuestionLogic> quLogics=new ArrayList<QuestionLogic>();
 		for (String key : quLogicIdMap.keySet()) {
@@ -143,12 +131,8 @@ public class QuChenAction extends ActionSupport{
 			String visibility=request.getParameter("visibility_"+key);
 			String logicType=request.getParameter("logicType_"+key);
 			Object quLogicId=quLogicIdMap.get(key);
-			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():"";
-			
+			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():null;
 			QuestionLogic quLogic=new QuestionLogic();
-			if("".equals(quLogic)){
-				quLogic=null;
-			}
 			quLogic.setId(quLogicIdValue);
 			quLogic.setCgQuItemId(cgQuItemId);
 			quLogic.setSkQuId(skQuId);
@@ -158,17 +142,14 @@ public class QuChenAction extends ActionSupport{
 			quLogics.add(quLogic);
 		}
 		entity.setQuestionLogics(quLogics);
-		
 		return entity;
 	}
 	
 	public static String buildResultJson(Question entity){
-		//{id:'null',quItems:[{id:'null',title:'null'},{id:'null',title:'null'}]}
 		StringBuffer strBuf=new StringBuffer();
 		strBuf.append("{id:'").append(entity.getId());
 		strBuf.append("',orderById:");
 		strBuf.append(entity.getOrderById());
-		//列选项
 		strBuf.append(",quColumnItems:[");
 		List<QuChenColumn> quChenColumns=entity.getColumns();
 		for (QuChenColumn column : quChenColumns) {
@@ -180,8 +161,6 @@ public class QuChenAction extends ActionSupport{
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]");
-		
-		//行选项
 		strBuf.append(",quRowItems:[");
 		List<QuChenRow> rows=entity.getRows();
 		for (QuChenRow quChenRow : rows) {
@@ -193,8 +172,6 @@ public class QuChenAction extends ActionSupport{
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]");
-		
-		//逻辑选项
 		strBuf.append(",quLogics:[");
 		List<QuestionLogic> questionLogics=entity.getQuestionLogics();
 		if(questionLogics!=null){

src/main/java/com/key/dwsurvey/action/QuChenRadioAction.java

@@ -50,7 +50,6 @@ public class QuChenRadioAction extends ActionSupport{
 			questionManager.save(entity);
 			String resultJson=buildResultJson(entity);
 			response.getWriter().write(resultJson);
-			//返回各部分ID
 		}catch (Exception e) {
 			e.printStackTrace();
 			response.getWriter().write("error");
@@ -64,14 +63,10 @@ public class QuChenRadioAction extends ActionSupport{
 		String quTitle=request.getParameter("quTitle");
 		String orderById=request.getParameter("orderById");
 		String tag=request.getParameter("tag");
-		//isRequired 是否必选
 		String isRequired=request.getParameter("isRequired");
-		//hv 1水平显示 2垂直显示
 		String hv=request.getParameter("hv");
-		//randOrder 选项随机排列
 		String randOrder=request.getParameter("randOrder");
 		String cellCount=request.getParameter("cellCount");
-		
 		if("".equals(quId)){
 			quId=null;
 		}
@@ -84,17 +79,14 @@ public class QuChenRadioAction extends ActionSupport{
 		entity.setOrderById(Integer.parseInt(orderById));
 		entity.setTag(Integer.parseInt(tag));
 		entity.setQuType(QuType.CHENRADIO);
-		//参数
 		isRequired=(isRequired==null || "".equals(isRequired))?"0":isRequired;
 		hv=(hv==null || "".equals(hv))?"0":hv;
 		randOrder=(randOrder==null || "".equals(randOrder))?"0":randOrder;
 		cellCount=(cellCount==null || "".equals(cellCount))?"0":cellCount;
-		
 		entity.setIsRequired(Integer.parseInt(isRequired));
 		entity.setHv(Integer.parseInt(hv));
 		entity.setRandOrder(Integer.parseInt(randOrder));
 		entity.setCellCount(Integer.parseInt(cellCount));
-		//quChenColumn列选项
 		Map<String, Object> columnOptionNameMaps=WebUtils.getParametersStartingWith(request, "columnValue_");
 		List<QuChenColumn> quChenColumns=new ArrayList<QuChenColumn>();
 		for (String key : columnOptionNameMaps.keySet()) {
@@ -131,8 +123,6 @@ public class QuChenRadioAction extends ActionSupport{
 			quChenRows.add(quChenRow);
 		}
 		entity.setRows(quChenRows);
-		
-		//逻辑选项设置
 		Map<String, Object> quLogicIdMap=WebUtils.getParametersStartingWith(request, "quLogicId_");
 		List<QuestionLogic> quLogics=new ArrayList<QuestionLogic>();
 		for (String key : quLogicIdMap.keySet()) {
@@ -141,12 +131,8 @@ public class QuChenRadioAction extends ActionSupport{
 			String visibility=request.getParameter("visibility_"+key);
 			String logicType=request.getParameter("logicType_"+key);
 			Object quLogicId=quLogicIdMap.get(key);
-			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():"";
-			
+			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():null;
 			QuestionLogic quLogic=new QuestionLogic();
-			if("".equals(quLogic)){
-				quLogic=null;
-			}
 			quLogic.setId(quLogicIdValue);
 			quLogic.setCgQuItemId(cgQuItemId);
 			quLogic.setSkQuId(skQuId);
@@ -156,17 +142,14 @@ public class QuChenRadioAction extends ActionSupport{
 			quLogics.add(quLogic);
 		}
 		entity.setQuestionLogics(quLogics);
-		
 		return entity;
 	}
 	
 	public static String buildResultJson(Question entity){
-		//{id:'null',quItems:[{id:'null',title:'null'},{id:'null',title:'null'}]}
 		StringBuffer strBuf=new StringBuffer();
 		strBuf.append("{id:'").append(entity.getId());
 		strBuf.append("',orderById:");
 		strBuf.append(entity.getOrderById());
-		//列选项
 		strBuf.append(",quColumnItems:[");
 		List<QuChenColumn> quChenColumns=entity.getColumns();
 		for (QuChenColumn column : quChenColumns) {
@@ -178,8 +161,6 @@ public class QuChenRadioAction extends ActionSupport{
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]");
-		
-		//行选项
 		strBuf.append(",quRowItems:[");
 		List<QuChenRow> rows=entity.getRows();
 		for (QuChenRow quChenRow : rows) {
@@ -191,8 +172,6 @@ public class QuChenRadioAction extends ActionSupport{
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]");
-		
-		//逻辑选项
 		strBuf.append(",quLogics:[");
 		List<QuestionLogic> questionLogics=entity.getQuestionLogics();
 		if(questionLogics!=null){

src/main/java/com/key/dwsurvey/action/QuFillblankAction.java

@@ -54,7 +54,6 @@ public class QuFillblankAction extends ActionSupport{
 			questionManager.save(entity);
 			String resultJson=buildResultJson(entity);
 			response.getWriter().write(resultJson);
-			//返回各部分ID
 		}catch (Exception e) {
 			e.printStackTrace();
 			response.getWriter().write("error");
@@ -68,24 +67,15 @@ public class QuFillblankAction extends ActionSupport{
 		String quTitle=request.getParameter("quTitle");
 		String orderById=request.getParameter("orderById");
 		String tag=request.getParameter("tag");
-		//isRequired 是否必选
 		String isRequired=request.getParameter("isRequired");
-		
 		String answerInputWidth=request.getParameter("answerInputWidth");
 		String answerInputRow=request.getParameter("answerInputRow");
-		
 		String contactsAttr=request.getParameter("contactsAttr");
 		String contactsField=request.getParameter("contactsField");
-		
 		String checkType=request.getParameter("checkType");
-		
-		/** 某一类型题目特有的 **/
-		//hv 1水平显示 2垂直显示
 		String hv=request.getParameter("hv");
-		//randOrder 选项随机排列
 		String randOrder=request.getParameter("randOrder");
 		String cellCount=request.getParameter("cellCount");
-		
 		if("".equals(quId)){
 			quId=null;
 		}
@@ -98,29 +88,23 @@ public class QuFillblankAction extends ActionSupport{
 		entity.setOrderById(Integer.parseInt(orderById));
 		entity.setTag(Integer.parseInt(tag));
 		entity.setQuType(QuType.FILLBLANK);
-		//参数
 		isRequired=(isRequired==null || "".equals(isRequired))?"0":isRequired;
 		hv=(hv==null || "".equals(hv))?"0":hv;
 		randOrder=(randOrder==null || "".equals(randOrder))?"0":randOrder;
 		cellCount=(cellCount==null || "".equals(cellCount))?"0":cellCount;
-		
 		contactsAttr=(contactsAttr==null || "".equals(contactsAttr))?"0":contactsAttr;
 		entity.setContactsAttr(Integer.parseInt(contactsAttr));
 		entity.setContactsField(contactsField);
-		
 		answerInputWidth=(answerInputWidth==null || "".equals(answerInputWidth))?"300":answerInputWidth;
 		answerInputRow=(answerInputRow==null || "".equals(answerInputRow))?"1":answerInputRow;
 		entity.setAnswerInputWidth(Integer.parseInt(answerInputWidth));
 		entity.setAnswerInputRow(Integer.parseInt(answerInputRow));
-		
 		entity.setIsRequired(Integer.parseInt(isRequired));
 		entity.setHv(Integer.parseInt(hv));
 		entity.setRandOrder(Integer.parseInt(randOrder));
 		entity.setCellCount(Integer.parseInt(cellCount));
-		
 		checkType=(checkType==null || "".equals(checkType))?"NO":checkType;
 		entity.setCheckType(CheckType.valueOf(checkType));
-		//逻辑选项设置
 		Map<String, Object> quLogicIdMap=WebUtils.getParametersStartingWith(request, "quLogicId_");
 		List<QuestionLogic> quLogics=new ArrayList<QuestionLogic>();
 		for (String key : quLogicIdMap.keySet()) {
@@ -129,12 +113,8 @@ public class QuFillblankAction extends ActionSupport{
 			String visibility=request.getParameter("visibility_"+key);
 			String logicType=request.getParameter("logicType_"+key);
 			Object quLogicId=quLogicIdMap.get(key);
-			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():"";
-			
+			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():null;
 			QuestionLogic quLogic=new QuestionLogic();
-			if("".equals(quLogic)){
-				quLogic=null;
-			}
 			quLogic.setId(quLogicIdValue);
 			quLogic.setCgQuItemId(cgQuItemId);
 			quLogic.setSkQuId(skQuId);
@@ -144,17 +124,14 @@ public class QuFillblankAction extends ActionSupport{
 			quLogics.add(quLogic);
 		}
 		entity.setQuestionLogics(quLogics);
-		
 		return entity;
 	}
 	
 	public static String buildResultJson(Question entity){
-		//{id:'null',quItems:[{id:'null',title:'null'},{id:'null',title:'null'}]}
 		StringBuffer strBuf=new StringBuffer();
 		strBuf.append("{id:'").append(entity.getId());
 		strBuf.append("',orderById:");
 		strBuf.append(entity.getOrderById());
-		
 		strBuf.append(",quLogics:[");
 		List<QuestionLogic> questionLogics=entity.getQuestionLogics();
 		if(questionLogics!=null){
@@ -173,7 +150,6 @@ public class QuFillblankAction extends ActionSupport{
 
 
 	private Page<AnFillblank> anPage = new Page<AnFillblank>();
-	//取上传题结果
 	public String answers() throws Exception {
 		HttpServletRequest request = Struts2Utils.getRequest();
 		String quId = request.getParameter("quId");

src/main/java/com/key/dwsurvey/action/QuMultiFillblankAction.java

@@ -54,7 +54,6 @@ public class QuMultiFillblankAction extends ActionSupport{
 			questionManager.save(entity);
 			String resultJson=buildResultJson(entity);
 			response.getWriter().write(resultJson);
-			//返回各部分ID
 		}catch (Exception e) {
 			e.printStackTrace();
 			response.getWriter().write("error");
@@ -68,7 +67,6 @@ public class QuMultiFillblankAction extends ActionSupport{
 		String quTitle=request.getParameter("quTitle");
 		String orderById=request.getParameter("orderById");
 		String tag=request.getParameter("tag");
-		//isRequired 是否必选
 		String isRequired=request.getParameter("isRequired");
 		//hv 1水平显示 2垂直显示
 		String hv=request.getParameter("hv");
@@ -77,7 +75,6 @@ public class QuMultiFillblankAction extends ActionSupport{
 		String cellCount=request.getParameter("cellCount");
 		String paramInt01=request.getParameter("paramInt01");//最小分
 		String paramInt02=request.getParameter("paramInt02");//最大分
-		
 		if("".equals(quId)){
 			quId=null;
 		}
@@ -96,14 +93,12 @@ public class QuMultiFillblankAction extends ActionSupport{
 		randOrder=(randOrder==null || "".equals(randOrder))?"0":randOrder;
 		cellCount=(cellCount==null || "".equals(cellCount))?"0":cellCount;
 		paramInt01=(paramInt01==null || "".equals(paramInt01))?"0":paramInt01;
-		
 		entity.setIsRequired(Integer.parseInt(isRequired));
 		entity.setHv(Integer.parseInt(hv));
 		entity.setRandOrder(Integer.parseInt(randOrder));
 		entity.setCellCount(Integer.parseInt(cellCount));
 		entity.setParamInt01(Integer.parseInt(paramInt01));
 		entity.setParamInt02(10);
-		//quOption
 		Map<String, Object> optionNameMap=WebUtils.getParametersStartingWith(request, "optionValue_");
 		List<QuMultiFillblank> quMFillblanks=new ArrayList<QuMultiFillblank>();
 		for (String key : optionNameMap.keySet()) {
@@ -132,12 +127,9 @@ public class QuMultiFillblankAction extends ActionSupport{
 			String visibility=request.getParameter("visibility_"+key);
 			String logicType=request.getParameter("logicType_"+key);
 			Object quLogicId=quLogicIdMap.get(key);
-			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():"";
+			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():null;
 			
 			QuestionLogic quLogic=new QuestionLogic();
-			if("".equals(quLogic)){
-				quLogic=null;
-			}
 			quLogic.setId(quLogicIdValue);
 			quLogic.setCgQuItemId(cgQuItemId);
 			quLogic.setSkQuId(skQuId);
@@ -152,9 +144,7 @@ public class QuMultiFillblankAction extends ActionSupport{
 	}
 	
 	public static String buildResultJson(Question entity){
-		//{id:'null',quItems:[{id:'null',title:'null'},{id:'null',title:'null'}]}
 		StringBuffer strBuf=new StringBuffer();
-		//{id:'',quItems:[{id:'',title:''},{id:'',title:''}]}
 		strBuf.append("{id:'").append(entity.getId());
 		strBuf.append("',orderById:");
 		strBuf.append(entity.getOrderById());

src/main/java/com/key/dwsurvey/action/QuOrderquAction.java

@@ -47,7 +47,6 @@ public class QuOrderquAction extends ActionSupport{
 			questionManager.save(entity);
 			String resultJson=buildResultJson(entity);
 			response.getWriter().write(resultJson);
-			//返回各部分ID
 		}catch (Exception e) {
 			e.printStackTrace();
 			response.getWriter().write("error");
@@ -81,17 +80,14 @@ public class QuOrderquAction extends ActionSupport{
 		entity.setOrderById(Integer.parseInt(orderById));
 		entity.setTag(Integer.parseInt(tag));
 		entity.setQuType(QuType.ORDERQU);
-		//参数
 		isRequired=(isRequired==null || "".equals(isRequired))?"0":isRequired;
 		hv=(hv==null || "".equals(hv))?"0":hv;
 		randOrder=(randOrder==null || "".equals(randOrder))?"0":randOrder;
 		cellCount=(cellCount==null || "".equals(cellCount))?"0":cellCount;
-		
 		entity.setIsRequired(Integer.parseInt(isRequired));
 		entity.setHv(Integer.parseInt(hv));
 		entity.setRandOrder(Integer.parseInt(randOrder));
 		entity.setCellCount(Integer.parseInt(cellCount));
-		//quOption
 		Map<String, Object> optionNameMap=WebUtils.getParametersStartingWith(request, "optionValue_");
 		List<QuOrderby> quOrderbys=new ArrayList<QuOrderby>();
 		for (String key : optionNameMap.keySet()) {
@@ -120,12 +116,8 @@ public class QuOrderquAction extends ActionSupport{
 			String visibility=request.getParameter("visibility_"+key);
 			String logicType=request.getParameter("logicType_"+key);
 			Object quLogicId=quLogicIdMap.get(key);
-			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():"";
-			
+			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():null;
 			QuestionLogic quLogic=new QuestionLogic();
-			if("".equals(quLogic)){
-				quLogic=null;
-			}
 			quLogic.setId(quLogicIdValue);
 			quLogic.setCgQuItemId(cgQuItemId);
 			quLogic.setSkQuId(skQuId);
@@ -140,7 +132,6 @@ public class QuOrderquAction extends ActionSupport{
 	}
 	
 	public static String buildResultJson(Question entity){
-		//{id:'null',quItems:[{id:'null',title:'null'},{id:'null',title:'null'}]}
 		StringBuffer strBuf=new StringBuffer();
 		strBuf.append("{id:'").append(entity.getId());
 		strBuf.append("',orderById:");
@@ -156,7 +147,6 @@ public class QuOrderquAction extends ActionSupport{
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]");
-		
 		strBuf.append(",quLogics:[");
 		List<QuestionLogic> questionLogics=entity.getQuestionLogics();
 		if(questionLogics!=null){

src/main/java/com/key/dwsurvey/action/QuPagetagAction.java

@@ -44,7 +44,6 @@ public class QuPagetagAction extends ActionSupport{
 			questionManager.save(entity);
 			String resultJson=buildResultJson(entity);
 			response.getWriter().write(resultJson);
-			//返回各部分ID
 		}catch (Exception e) {
 			e.printStackTrace();
 			response.getWriter().write("error");
@@ -60,8 +59,6 @@ public class QuPagetagAction extends ActionSupport{
 		String tag=request.getParameter("tag");
 		//isRequired 是否必选
 		String isRequired=request.getParameter("isRequired");
-		
-		/** 某一类型题目特有的 **/
 		//hv 1水平显示 2垂直显示
 		String hv=request.getParameter("hv");
 		//randOrder 选项随机排列
@@ -80,7 +77,6 @@ public class QuPagetagAction extends ActionSupport{
 		entity.setOrderById(Integer.parseInt(orderById));
 		entity.setTag(Integer.parseInt(tag));
 		entity.setQuType(QuType.PAGETAG);
-		//参数
 		isRequired=(isRequired==null || "".equals(isRequired))?"0":isRequired;
 		hv=(hv==null || "".equals(hv))?"0":hv;
 		randOrder=(randOrder==null || "".equals(randOrder))?"0":randOrder;
@@ -91,7 +87,6 @@ public class QuPagetagAction extends ActionSupport{
 		entity.setRandOrder(Integer.parseInt(randOrder));
 		entity.setCellCount(Integer.parseInt(cellCount));
 		
-		//逻辑选项设置
 		Map<String, Object> quLogicIdMap=WebUtils.getParametersStartingWith(request, "quLogicId_");
 		List<QuestionLogic> quLogics=new ArrayList<QuestionLogic>();
 		for (String key : quLogicIdMap.keySet()) {
@@ -100,12 +95,9 @@ public class QuPagetagAction extends ActionSupport{
 			String visibility=request.getParameter("visibility_"+key);
 			String logicType=request.getParameter("logicType_"+key);
 			Object quLogicId=quLogicIdMap.get(key);
-			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():"";
+			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():null;
 			
 			QuestionLogic quLogic=new QuestionLogic();
-			if("".equals(quLogic)){
-				quLogic=null;
-			}
 			quLogic.setId(quLogicIdValue);
 			quLogic.setCgQuItemId(cgQuItemId);
 			quLogic.setSkQuId(skQuId);
@@ -120,13 +112,10 @@ public class QuPagetagAction extends ActionSupport{
 	}
 	
 	public static String buildResultJson(Question entity){
-		//{id:'null',quItems:[{id:'null',title:'null'},{id:'null',title:'null'}]}
 		StringBuffer strBuf=new StringBuffer();
-		//{id:'',quItems:[{id:'',title:''},{id:'',title:''}]}
 		strBuf.append("{id:'").append(entity.getId());
 		strBuf.append("',orderById:");
 		strBuf.append(entity.getOrderById());
-		
 		strBuf.append(",quLogics:[");
 		List<QuestionLogic> questionLogics=entity.getQuestionLogics();
 		if(questionLogics!=null){

src/main/java/com/key/dwsurvey/action/QuParagraphAction.java

@@ -43,7 +43,6 @@ public class QuParagraphAction extends ActionSupport{
 			questionManager.save(entity);
 			String resultJson=buildResultJson(entity);
 			response.getWriter().write(resultJson);
-			//返回各部分ID
 		}catch (Exception e) {
 			e.printStackTrace();
 			response.getWriter().write("error");
@@ -57,10 +56,7 @@ public class QuParagraphAction extends ActionSupport{
 		String quTitle=request.getParameter("quTitle");
 		String orderById=request.getParameter("orderById");
 		String tag=request.getParameter("tag");
-		//isRequired 是否必选
 		String isRequired=request.getParameter("isRequired");
-		
-		/** 某一类型题目特有的 **/
 		//hv 1水平显示 2垂直显示
 		String hv=request.getParameter("hv");
 		//randOrder 选项随机排列
@@ -79,18 +75,14 @@ public class QuParagraphAction extends ActionSupport{
 		entity.setOrderById(Integer.parseInt(orderById));
 		entity.setTag(Integer.parseInt(tag));
 		entity.setQuType(QuType.PARAGRAPH);
-		//参数
 		isRequired=(isRequired==null || "".equals(isRequired))?"0":isRequired;
 		hv=(hv==null || "".equals(hv))?"0":hv;
 		randOrder=(randOrder==null || "".equals(randOrder))?"0":randOrder;
 		cellCount=(cellCount==null || "".equals(cellCount))?"0":cellCount;
-		
 		entity.setIsRequired(Integer.parseInt(isRequired));
 		entity.setHv(Integer.parseInt(hv));
 		entity.setRandOrder(Integer.parseInt(randOrder));
 		entity.setCellCount(Integer.parseInt(cellCount));
-		
-		//逻辑选项设置
 		Map<String, Object> quLogicIdMap=WebUtils.getParametersStartingWith(request, "quLogicId_");
 		List<QuestionLogic> quLogics=new ArrayList<QuestionLogic>();
 		for (String key : quLogicIdMap.keySet()) {
@@ -99,12 +91,8 @@ public class QuParagraphAction extends ActionSupport{
 			String visibility=request.getParameter("visibility_"+key);
 			String logicType=request.getParameter("logicType_"+key);
 			Object quLogicId=quLogicIdMap.get(key);
-			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():"";
-			
+			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():null;
 			QuestionLogic quLogic=new QuestionLogic();
-			if("".equals(quLogic)){
-				quLogic=null;
-			}
 			quLogic.setId(quLogicIdValue);
 			quLogic.setCgQuItemId(cgQuItemId);
 			quLogic.setSkQuId(skQuId);
@@ -119,13 +107,10 @@ public class QuParagraphAction extends ActionSupport{
 	}
 	
 	public static String buildResultJson(Question entity){
-		//{id:'null',quItems:[{id:'null',title:'null'},{id:'null',title:'null'}]}
 		StringBuffer strBuf=new StringBuffer();
-		//{id:'',quItems:[{id:'',title:''},{id:'',title:''}]}
 		strBuf.append("{id:'").append(entity.getId());
 		strBuf.append("',orderById:");
 		strBuf.append(entity.getOrderById());
-		
 		strBuf.append(",quLogics:[");
 		List<QuestionLogic> questionLogics=entity.getQuestionLogics();
 		if(questionLogics!=null){

src/main/java/com/key/dwsurvey/action/QuRadioAction.java

@@ -50,7 +50,6 @@ public class QuRadioAction extends ActionSupport{
 			questionManager.save(entity);
 			String resultJson=buildResultJson(entity);
 			response.getWriter().write(resultJson);
-			//返回各部分ID
 		}catch (Exception e) {
 			e.printStackTrace();
 			response.getWriter().write("error");
@@ -64,11 +63,8 @@ public class QuRadioAction extends ActionSupport{
 		String quTitle=request.getParameter("quTitle");
 		String orderById=request.getParameter("orderById");
 		String tag=request.getParameter("tag");
-		//isRequired 是否必选
 		String isRequired=request.getParameter("isRequired");
-		//hv 1水平显示 2垂直显示
 		String hv=request.getParameter("hv");
-		//randOrder 选项随机排列
 		String randOrder=request.getParameter("randOrder");
 		String cellCount=request.getParameter("cellCount");
 		String contactsAttr=request.getParameter("contactsAttr");
@@ -86,21 +82,17 @@ public class QuRadioAction extends ActionSupport{
 		entity.setOrderById(Integer.parseInt(orderById));
 		entity.setTag(Integer.parseInt(tag));
 		entity.setQuType(QuType.RADIO);
-		//参数
 		isRequired=(isRequired==null || "".equals(isRequired))?"0":isRequired;
 		hv=(hv==null || "".equals(hv))?"0":hv;
 		randOrder=(randOrder==null || "".equals(randOrder))?"0":randOrder;
 		cellCount=(cellCount==null || "".equals(cellCount))?"0":cellCount;
-		
 		contactsAttr=(contactsAttr==null || "".equals(contactsAttr))?"0":contactsAttr;
 		entity.setContactsAttr(Integer.parseInt(contactsAttr));
 		entity.setContactsField(contactsField);
-		
 		entity.setIsRequired(Integer.parseInt(isRequired));
 		entity.setHv(Integer.parseInt(hv));
 		entity.setRandOrder(Integer.parseInt(randOrder));
 		entity.setCellCount(Integer.parseInt(cellCount));
-		//quOption
 		Map<String, Object> optionNameMap=WebUtils.getParametersStartingWith(request, "optionValue_");
 		List<QuRadio> quRadios=new ArrayList<QuRadio>();
 		for (String key : optionNameMap.keySet()) {
@@ -139,14 +131,9 @@ public class QuRadioAction extends ActionSupport{
 			String skQuId=request.getParameter("skQuId_"+key);
 			String visibility=request.getParameter("visibility_"+key);
 			String logicType=request.getParameter("logicType_"+key);
-
 			Object quLogicId=quLogicIdMap.get(key);
-			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():"";
-
+			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():null;
 			QuestionLogic quLogic=new QuestionLogic();
-			if("".equals(quLogic)){
-				quLogic=null;
-			}
 			quLogic.setId(quLogicIdValue);
 			quLogic.setCgQuItemId(cgQuItemId);
 			quLogic.setSkQuId(skQuId);
@@ -161,9 +148,7 @@ public class QuRadioAction extends ActionSupport{
 	}
 	
 	public static String buildResultJson(Question entity){
-		//{id:'null',quItems:[{id:'null',title:'null'},{id:'null',title:'null'}]}
 		StringBuffer strBuf=new StringBuffer();
-		//{id:'',quItems:[{id:'',title:''},{id:'',title:''}]}
 		strBuf.append("{id:'").append(entity.getId());
 		strBuf.append("',orderById:");
 		strBuf.append(entity.getOrderById());

src/main/java/com/key/dwsurvey/action/QuScoreAction.java

@@ -49,7 +49,6 @@ public class QuScoreAction extends ActionSupport{
 			questionManager.save(entity);
 			String resultJson=buildResultJson(entity);
 			response.getWriter().write(resultJson);
-			//返回各部分ID
 		}catch (Exception e) {
 			e.printStackTrace();
 			response.getWriter().write("error");
@@ -67,7 +66,6 @@ public class QuScoreAction extends ActionSupport{
 		String isRequired=request.getParameter("isRequired");
 		//hv 1水平显示 2垂直显示
 		String hv=request.getParameter("hv");
-		//randOrder 选项随机排列
 		String randOrder=request.getParameter("randOrder");
 		String cellCount=request.getParameter("cellCount");
 		
@@ -86,13 +84,11 @@ public class QuScoreAction extends ActionSupport{
 		entity.setOrderById(Integer.parseInt(orderById));
 		entity.setTag(Integer.parseInt(tag));
 		entity.setQuType(QuType.SCORE);
-		//参数
 		isRequired=(isRequired==null || "".equals(isRequired))?"0":isRequired;
 		hv=(hv==null || "".equals(hv))?"0":hv;
 		randOrder=(randOrder==null || "".equals(randOrder))?"0":randOrder;
 		cellCount=(cellCount==null || "".equals(cellCount))?"0":cellCount;
 		paramInt02=(paramInt02==null || "".equals(paramInt02))?"0":paramInt02;
-		
 		entity.setIsRequired(Integer.parseInt(isRequired));
 		entity.setHv(Integer.parseInt(hv));
 		entity.setRandOrder(Integer.parseInt(randOrder));
@@ -118,7 +114,6 @@ public class QuScoreAction extends ActionSupport{
 		}
 		entity.setQuScores(quScores);
 		
-		//逻辑选项设置
 		Map<String, Object> quLogicIdMap=WebUtils.getParametersStartingWith(request, "quLogicId_");
 		List<QuestionLogic> quLogics=new ArrayList<QuestionLogic>();
 		for (String key : quLogicIdMap.keySet()) {
@@ -130,12 +125,9 @@ public class QuScoreAction extends ActionSupport{
 			String logicType=request.getParameter("logicType_"+key);
 			
 			Object quLogicId=quLogicIdMap.get(key);
-			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():"";
+			String quLogicIdValue=(quLogicId!=null)?quLogicId.toString():null;
 			
 			QuestionLogic quLogic=new QuestionLogic();
-			if("".equals(quLogic)){
-				quLogic=null;
-			}
 			if(geLe==null || "".equals(geLe)){
 			    geLe="le";
 			}
@@ -158,9 +150,7 @@ public class QuScoreAction extends ActionSupport{
 	}
 	
 	public static String buildResultJson(Question entity){
-		//{id:'null',quItems:[{id:'null',title:'null'},{id:'null',title:'null'}]}
 		StringBuffer strBuf=new StringBuffer();
-		//{id:'',quItems:[{id:'',title:''},{id:'',title:''}]}
 		strBuf.append("{id:'").append(entity.getId());
 		strBuf.append("',orderById:");
 		strBuf.append(entity.getOrderById());