默认添加排序题完成

skyeye-promote/src/main/java/com/skyeye/eve/controller/DwSurveyDirectoryController.java

@@ -128,4 +128,20 @@ public class DwSurveyDirectoryController {
 		dwSurveyDirectoryService.addQuScoreMation(inputObject, outputObject);
 	}
 	
+	/**
+	 * 
+	     * @Title: addQuOrderquMation
+	     * @Description: 添加排序题
+	     * @param @param inputObject
+	     * @param @param outputObject
+	     * @param @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/DwSurveyDirectoryController/addQuOrderquMation")
+	@ResponseBody
+	public void addQuOrderquMation(InputObject inputObject, OutputObject outputObject) throws Exception{
+		dwSurveyDirectoryService.addQuOrderquMation(inputObject, outputObject);
+	}
+	
 }

skyeye-promote/src/main/java/com/skyeye/eve/dao/DwSurveyDirectoryDao.java

@@ -48,4 +48,8 @@ public interface DwSurveyDirectoryDao {
 
 	public int addQuestionScoreMationList(List<Map<String, Object>> quScore) throws Exception;
 
+	public int addQuestionOrderquMationList(List<Map<String, Object>> quOrderqu) throws Exception;
+	
+	public int addQuestionRadioMationList(List<Map<String, Object>> quRadio) throws Exception;
+
 }

skyeye-promote/src/main/java/com/skyeye/eve/service/DwSurveyDirectoryService.java

@@ -19,4 +19,6 @@ public interface DwSurveyDirectoryService {
 
 	public void addQuScoreMation(InputObject inputObject, OutputObject outputObject) throws Exception;
 
+	public void addQuOrderquMation(InputObject inputObject, OutputObject outputObject) throws Exception;
+
 }

skyeye-promote/src/main/java/com/skyeye/eve/service/impl/DwSurveyDirectoryServiceImpl.java

@@ -299,5 +299,78 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
 		}
 		outputObject.setBean(map);
 	}
+
+	/**
+	 * 
+	     * @Title: addQuOrderquMation
+	     * @Description: 添加排序题
+	     * @param @param inputObject
+	     * @param @param outputObject
+	     * @param @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@Override
+	public void addQuOrderquMation(InputObject inputObject, OutputObject outputObject) throws Exception {
+		Map<String, Object> map = inputObject.getParams();
+		map.put("quType", QuType.ORDERQU.getIndex());
+		String quId = "";
+		if(ToolUtil.isBlank(map.get("quId").toString())){
+			quId = ToolUtil.getSurFaceId();
+			map.put("id", quId);
+			map.put("quTag", 1);
+			map.put("visibility", 1);
+			map.put("createTime", ToolUtil.getTimeAndToString());
+			dwSurveyDirectoryDao.addQuestionMation(map);
+		}else{
+			
+		}
+		
+		JSONArray orderqu = JSONArray.fromObject(map.get("orderquTd").toString());//获取模板绑定信息
+		if(orderqu.size() > 0){
+			List<Map<String, Object>> quOrderqu = new ArrayList<>();
+			Map<String, Object> user = inputObject.getLogParams();
+			for(int i = 0; i < orderqu.size(); i++){
+				JSONObject object = (JSONObject) orderqu.get(i);
+				Map<String, Object> bean = new HashMap<>();
+				bean.put("optionId", object.getString("optionId"));
+				bean.put("orderById", object.getString("key"));
+				bean.put("optionName", object.getString("optionValue"));
+				bean.put("quId", quId);
+				bean.put("visibility", 1);
+				bean.put("isNote", 0);
+				bean.put("isRequiredFill", 0);
+				bean.put("id", ToolUtil.getSurFaceId());
+				bean.put("createId", user.get("id"));
+				bean.put("createTime", ToolUtil.getTimeAndToString());
+				quOrderqu.add(bean);
+			}
+			dwSurveyDirectoryDao.addQuestionOrderquMationList(quOrderqu);
+			map.put("quItems", quOrderqu);
+		}
+		
+		JSONArray array = JSONArray.fromObject(map.get("logic").toString());//获取模板绑定信息
+		if(array.size() > 0){
+			List<Map<String, Object>> quLogics = new ArrayList<>();
+			Map<String, Object> user = inputObject.getLogParams();
+			for(int i = 0; i < array.size(); i++){
+				JSONObject object = (JSONObject) array.get(i);
+				Map<String, Object> bean = new HashMap<>();
+				bean.put("quLogicId", object.getString("quLogicId"));
+				bean.put("cgQuItemId", object.getString("cgQuItemId"));
+				bean.put("skQuId", object.getString("skQuId"));
+				bean.put("visibility", object.getString("visibility"));
+				bean.put("logicType", object.getString("logicType"));
+				bean.put("title", object.getString("key"));
+				bean.put("id", ToolUtil.getSurFaceId());
+				bean.put("createId", user.get("id"));
+				bean.put("createTime", ToolUtil.getTimeAndToString());
+				quLogics.add(bean);
+			}
+			dwSurveyDirectoryDao.addQuestionLogicsMationList(quLogics);
+			map.put("quLogics", quLogics);
+		}
+		outputObject.setBean(map);
+	}
 	
 }

skyeye-promote/src/main/resources/dbmapper/DwSurveyDirectoryMapper.xml

@@ -346,4 +346,23 @@
 		</foreach>  
 	</insert>
 	
+	<insert id="addQuestionOrderquMationList" parameterType="java.util.Map">
+	     insert into dw_qu_orderby
+	     (id, qu_id, option_id, option_name, option_title, order_by_id, visibility, create_id, create_time)
+	     values
+		<foreach collection="list" item="item" index="index" separator="," >  
+			(#{item.id}, #{item.quId}, #{item.optionId}, #{item.optionName}, #{item.optionTitle}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime})  
+		</foreach>  
+	</insert>
+	
+	<insert id="addQuestionRadioMationList" parameterType="java.util.Map">
+	     insert into dw_qu_radio
+	     (id, qu_id, option_id, option_name, option_title, check_type, is_note, is_required_fill, order_by_id, visibility, create_id, create_time)
+	     values
+		<foreach collection="list" item="item" index="index" separator="," >  
+			(#{item.id}, #{item.quId}, #{item.optionId}, #{item.optionName}, #{item.optionTitle}, #{item.checkType}, #{item.isNote},
+				#{item.isRequiredFill}, #{item.orderById}, #{item.visibility}, #{item.createId}, #{item.createTime})  
+		</foreach>  
+	</insert>
+	
 </mapper>
\ No newline at end of file

skyeye-promote/src/main/resources/mapping/reqdwsurvey.xml

@@ -64,6 +64,19 @@
 	    <property id="scoreTd" name="scoreTd" ref="" var="评分题选项td json串"/>
 	    <property id="logic" name="logic" ref="" var="逻辑设置json串"/>
 	</url>
+	<url id="dwsurveydirectory008" path="/post/DwSurveyDirectoryController/addQuOrderquMation" val="添加排序题" allUse="1">
+	    <property id="quId" name="quId" ref="" var="问题id"/>
+	    <property id="belongId" name="belongId" ref="required" var="问卷id"/>
+	    <property id="quTitle" name="quTitle" ref="required" var="问题标题"/>
+	    <property id="orderById" name="orderById" ref="required,num" var="序号"/>
+	    <property id="tag" name="tag" ref="" var="表示题目是问卷题还是题库中题"/>
+	    <property id="isRequired" name="isRequired" ref="required,num" var="是否必选"/>
+	    <property id="hv" name="hv" ref="required,num" var="1水平显示 2垂直显示"/>
+	    <property id="randOrder" name="randOrder" ref="required,num" var="选项随机排列  1随机排列 0不随机排列"/>
+	    <property id="cellCount" name="cellCount" ref="required,num" var="按列显示时，列数"/>
+	    <property id="orderquTd" name="orderquTd" ref="" var="排序题选项td json串"/>
+	    <property id="logic" name="logic" ref="" var="逻辑设置json串"/>
+	</url>
 	<!-- 问卷调查结束 -->
 	
 </controller>
\ No newline at end of file

skyeye-promote/src/main/resources/template/js/dwsurveydesign/dwsurveydesign.js

@@ -2141,7 +2141,6 @@ layui.config({
     						quItemOption.find("input[name='quItemId']").val(item.id);
     						quItemOption.find(".quItemInputCase input[name='quItemSaveTag']").val(1);
     					});
-
     					//同步logic Id信息
     					var quLogics = json.bean.quLogics;
     					$.each(quLogics, function(i, item) {
@@ -2149,7 +2148,6 @@ layui.config({
     						logicItem.find("input[name='quLogicId']").val(item.id);
     						logicItem.find("input[name='logicSaveTag']").val(1);
     					});
-
     					//执行保存下一题
     					saveQus(quItemBody.next(), callback);
     					//同步-更新题目排序号
@@ -2174,7 +2172,6 @@ layui.config({
 	    	var quCoItemTable = quItemBody.find("table.quCoItemTable");
 	    	quCoItemTable.append("<tr class='quScoreOptionTr'>" + quScoreItemHtml + "</tr>");
 	    	quItemBody.find("input[name='saveTag']").val(0);
-
 	    	var scoreNumTableTr = quCoItemTable.find("tr.quScoreOptionTr:last  .scoreNumTable tr");
 	    	var paramInt02 = quItemBody.find("input[name='paramInt02']").val();
 	    	scoreNumTableTr.empty();
@@ -2182,9 +2179,7 @@ layui.config({
 	    		scoreNumTableTr.append("<td>" + i + "</td>");
 	    	}
 	    	quCoItemTable.find("tr.quScoreOptionTr:last input[name='quItemSaveTag']").val(0);
-
 	    	newEditObj = quCoItemTable.find("tr.quScoreOptionTr:last .editAble");
-
 	    	newEditObj.text(itemText);
 	    	if(itemText == "") {
 	    		newEditObj.css("display", "inline");
@@ -2217,102 +2212,93 @@ layui.config({
 
 	    //*****排序题****//
 	    /**
-	     ** 新保存排序题
+	     * 新保存排序题
 	     **/
 	    function saveOrderqu(quItemBody, callback) {
 	    	var saveTag = quItemBody.find("input[name='saveTag']").val();
-	    	if(saveTag == 0) {
-	    		var url = reqBasePath + "/design/qu-orderqu!ajaxSave.action";
-	    		var quType = quItemBody.find("input[name='quType']").val();
-	    		var quId = quItemBody.find("input[name='quId']").val();
-	    		var orderById = quItemBody.find("input[name='orderById']").val();
-	    		var isRequired = quItemBody.find("input[name='isRequired']").val();
-	    		var hv = quItemBody.find("input[name='hv']").val();
-	    		var randOrder = quItemBody.find("input[name='randOrder']").val();
-	    		var cellCount = quItemBody.find("input[name='cellCount']").val();
-
-	    		var data = "belongId=" + questionBelongId + "&orderById=" + orderById + "&tag=" + svTag + "&quType=" + quType + "&quId=" + quId;
-	    		data += "&isRequired=" + isRequired + "&hv=" + hv + "&randOrder=" + randOrder + "&cellCount=" + cellCount;
+	    	if(saveTag == 0 && isNull(quItemBody.find("input[name='quId']").val())) {
+	    		var data = {
+    				belongId: parent.rowId,
+    				orderById: quItemBody.find("input[name='orderById']").val(),
+    				tag: svTag,
+    				quId: quItemBody.find("input[name='quId']").val(),
+    				isRequired: quItemBody.find("input[name='isRequired']").val(),
+    				hv: quItemBody.find("input[name='hv']").val(),
+    				randOrder: quItemBody.find("input[name='randOrder']").val(),
+    				cellCount: quItemBody.find("input[name='cellCount']").val(),
+    				quTitle: '',
+	    		};
 
 	    		var quTitleSaveTag = quItemBody.find("input[name='quTitleSaveTag']").val();
 	    		if(quTitleSaveTag == 0) {
 	    			var quTitle = quItemBody.find(".quCoTitleEdit").html();
-	    			quTitle = escape(encodeURIComponent(quTitle));
-	    			data += "&quTitle=" + quTitle;
+	    			data.quTitle = encodeURI(quTitle);
 	    		}
 	    		//评分题选项td
 	    		var quItemOptions = quItemBody.find(".quCoItem .quOrderByLeft  li.quCoItemUlLi");
+	    		var orderquTd = [];
 	    		$.each(quItemOptions, function(i) {
-	    			var optionValue = $(this).find("label.quCoOptionEdit").html();
-	    			var optionId = $(this).find(".quItemInputCase input[name='quItemId']").val();
 	    			var quItemSaveTag = $(this).find(".quItemInputCase input[name='quItemSaveTag']").val();
 	    			if(quItemSaveTag == 0) {
-	    				optionValue = escape(encodeURIComponent(optionValue));
-	    				data += "&optionValue_" + i + "=" + optionValue;
-	    				data += "&optionId_" + i + "=" + optionId;
+	    				var s = {
+    						optionValue: encodeURI($(this).find("label.quCoOptionEdit").html()),
+    						optionId: $(this).find(".quItemInputCase input[name='quItemId']").val(),
+    						key: i,
+    	    			};
+	    				orderquTd.push(s);
 	    			}
-	    			//更新 字母 title标记到选项上.
 	    			$(this).addClass("quOption_" + i);
 	    		});
+	    		data.orderquTd = JSON.stringify(orderquTd);
 
 	    		//逻辑选项
 	    		var quLogicItems = quItemBody.find(".quLogicItem");
+	    		var list = [];
 	    		$.each(quLogicItems, function(i) {
-	    			var thClass = $(this).attr("class");
-	    			thClass = thClass.replace("quLogicItem quLogicItem_", "");
-
-	    			var quLogicId = $(this).find("input[name='quLogicId']").val();
-	    			var cgQuItemId = $(this).find("input[name='cgQuItemId']").val();
-	    			var skQuId = $(this).find("input[name='skQuId']").val();
 	    			var logicSaveTag = $(this).find("input[name='logicSaveTag']").val();
-	    			var visibility = $(this).find("input[name='visibility']").val();
-	    			var logicType = $(this).find("input[name='logicType']").val();
-	    			var itemIndex = thClass;
 	    			if(logicSaveTag == 0) {
-	    				data += "&quLogicId_" + itemIndex + "=" + quLogicId;
-	    				data += "&cgQuItemId_" + itemIndex + "=" + cgQuItemId;
-	    				data += "&skQuId_" + itemIndex + "=" + skQuId;
-	    				data += "&visibility_" + itemIndex + "=" + visibility;
-	    				data += "&logicType_" + itemIndex + "=" + logicType;
+	    				var s = {
+    						quLogicId: $(this).find("input[name='quLogicId']").val(),
+    						cgQuItemId: $(this).find("input[name='cgQuItemId']").val(),
+    						skQuId: $(this).find("input[name='skQuId']").val(),
+    						visibility: $(this).find("input[name='visibility']").val(),
+    						logicType: $(this).find("input[name='logicType']").val(),
+    						key: $(this).attr("class").replace("quLogicItem quLogicItem_", ""),
+    	    			};
+    	    			list.push(s);
 	    			}
 
 	    		});
-
-	    		$.ajax({
-	    			url: url,
-	    			data: data,
-	    			type: 'post',
-	    			success: function(msg) {
-	    				if(msg != "error") {
-	    					var jsons = eval("(" + msg + ")");
-	    					var quId = jsons.id;
-	    					quItemBody.find("input[name='quId']").val(quId);
-	    					var quItems = jsons.quItems;
-	    					$.each(quItems, function(i, item) {
-	    						var quItemOption = quItemBody.find(".quOption_" + item.title);
-	    						quItemOption.find("input[name='quItemId']").val(item.id);
-	    						quItemOption.find(".quItemInputCase input[name='quItemSaveTag']").val(1);
-	    					});
-
-	    					//同步logic Id信息
-	    					var quLogics = jsons.quLogics;
-	    					$.each(quLogics, function(i, item) {
-	    						var logicItem = quItemBody.find(".quLogicItem_" + item.title);
-	    						logicItem.find("input[name='quLogicId']").val(item.id);
-	    						logicItem.find("input[name='logicSaveTag']").val(1);
-	    					});
-
-	    					quItemBody.find("input[name='saveTag']").val(1);
-	    					quItemBody.find(".quCoTitle input[name='quTitleSaveTag']").val(1);
-
-	    					//执行保存下一题
-	    					saveQus(quItemBody.next(), callback);
-	    					//同步-更新题目排序号
-	    					quCBNum2++;
-	    					exeQuCBNum();
-	    				}
-	    			}
-	    		});
+	    		data.logic = JSON.stringify(list);
+	    		
+	    		AjaxPostUtil.request({url:reqBasePath + "dwsurveydirectory008", params:data, type:'json', callback:function(json){
+	 	   			if(json.returnCode == 0){
+		 	   			var quId = json.bean.id;
+		 	   			quItemBody.find("input[name='saveTag']").val(1);
+		 	   			quItemBody.find(".quCoTitle input[name='quTitleSaveTag']").val(1);
+			 	   		quItemBody.find("input[name='quId']").val(quId);
+						var quItems = json.bean.quItems;
+						$.each(quItems, function(i, item) {
+							var quItemOption = quItemBody.find(".quOption_" + item.title);
+							quItemOption.find("input[name='quItemId']").val(item.id);
+							quItemOption.find(".quItemInputCase input[name='quItemSaveTag']").val(1);
+						});
+						//同步logic Id信息
+						var quLogics = json.bean.quLogics;
+						$.each(quLogics, function(i, item) {
+							var logicItem = quItemBody.find(".quLogicItem_" + item.title);
+							logicItem.find("input[name='quLogicId']").val(item.id);
+							logicItem.find("input[name='logicSaveTag']").val(1);
+						});
+						//执行保存下一题
+						saveQus(quItemBody.next(), callback);
+						//同步-更新题目排序号
+						quCBNum2++;
+						exeQuCBNum();
+	 	   			}else{
+	 	   				top.winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+	 	   			}
+	 	   		}});
 	    	} else {
 	    		saveQus(quItemBody.next(), callback);
 	    	}

skyeye-promote/src/main/resources/template/tpl/dwsurveydesign/dwsurveydesignbean.tpl

@@ -54,8 +54,8 @@
 									<input type="hidden" name="contactsAttr" value="{{contactsAttr}}">
 									<input type="hidden" name="contactsField" value="{{contactsField}}">
 									<div class="quLogicInputCase">
-										<input type="hidden" name="quLogicItemNum" value="{{questionLogics.length}}">
-										{{#each questionLogics}}
+										<input type="hidden" name="quLogicItemNum" value="{{questionLogic.length}}">
+										{{#each questionLogic}}
 											<div class="quLogicItem quLogicItem_{{showIndex @index}}">
 												<input type="hidden" name="quLogicId" value="{{id}}" />
 												<input type="hidden" name="cgQuItemId" value="{{cgQuItemId}}" />
@@ -80,7 +80,7 @@
 											</li>
 											<li title="逻辑" class="dwQuLogic">
 												<div class="dwQuIcon">
-													<div class="quLogicInfo">{{questionLogics.length}}</div>
+													<div class="quLogicInfo">{{questionLogic.length}}</div>
 												</div>
 											</l}}
 											<li title="删除" class="dwQuDelete">
@@ -201,8 +201,8 @@
 											<input type="hidden" name="contactsAttr" value="{{contactsAttr}}">
 											<input type="hidden" name="contactsField" value="{{contactsField}}">
 											<div class="quLogicInputCase">
-												<input type="hidden" name="quLogicItemNum" value="{{questionLogics.length}}">
-												{{#each questionLogics}}
+												<input type="hidden" name="quLogicItemNum" value="{{questionLogic.length}}">
+												{{#each questionLogic}}
 													<div class="quLogicItem quLogicItem_{{showIndex @index}}">
 														<input type="hidden" name="quLogicId" value="{{id}}" />
 														<input type="hidden" name="cgQuItemId" value="{{cgQuItemId}}" />
@@ -227,7 +227,7 @@
 													</li>
 													<li title="逻辑" class="dwQuLogic">
 														<div class="dwQuIcon">
-															<div class="quLogicInfo">{{questionLogics.length}}</div>
+															<div class="quLogicInfo">{{questionLogic.length}}</div>
 														</div>
 													</li>
 													<li title="删除" class="dwQuDelete">
@@ -350,7 +350,7 @@
 													<input type="hidden" name="contactsAttr" value="{{contactsAttr}}">
 													<input type="hidden" name="contactsField" value="{{contactsField}}">
 													<div class="quLogicInputCase">
-														<input type="hidden" name="quLogicItemNum" value="{{questionLogics.length}}">
+														<input type="hidden" name="quLogicItemNum" value="{{questionLogic.length}}">
 														{{#each questionLogic}}
 															<div class="quLogicItem quLogicItem_{{showIndex @index}}">
 																<input type="hidden" name="quLogicId" value="{{id}}" />
@@ -376,7 +376,7 @@
 															</li>
 															<li title="逻辑" class="dwQuLogic">
 																<div class="dwQuIcon">
-																	<div class="quLogicInfo">{{questionLogics.length}}</div>
+																	<div class="quLogicInfo">{{questionLogic.length}}</div>
 																</div>
 															</li>
 															<li title="删除" class="dwQuDelete">
@@ -437,8 +437,8 @@
 															<input type="hidden" name="randOrder" value="{{randOrder}}">
 															<input type="hidden" name="cellCount" value="{{cellCount}}">
 															<div class="quLogicInputCase">
-																<input type="hidden" name="quLogicItemNum" value="{{questionLogics.length}}">
-																{{#each questionLogics}}
+																<input type="hidden" name="quLogicItemNum" value="{{questionLogic.length}}">
+																{{#each questionLogic}}
 																	<div class="quLogicItem quLogicItem_{{showIndex @index}}">
 																		<input type="hidden" name="quLogicId" value="{{id}}" />
 																		<input type="hidden" name="cgQuItemId" value="{{cgQuItemId}}" />
@@ -485,7 +485,7 @@
 																<div class="quCoItem">
 																	<div class="quOrderByLeft">
 																		<ul>
-																			{{#each quOrderbys}}
+																			{{#each questionOrderBy}}
 																				<li class="quCoItemUlLi"><label class="editAble quCoOptionEdit">{{optionName}}</label>
 																					<div class="quItemInputCase"><input type="hidden" name="quItemId" value="{{id}}"><input type="hidden" name="quItemSaveTag" value="1"></div>
 																				</li>
@@ -494,7 +494,7 @@
 																	</div>
 																	<div class="quOrderByRight">
 																		<table class="quOrderByTable">
-																			{{#each quOrderbys}}
+																			{{#each questionOrderBy}}
 																				<tr>
 																					<td class="quOrderyTableTd">{{showIndex @index}}</td>
 																					<td></td>
@@ -533,8 +533,8 @@
 																	<input type="hidden" name="randOrder" value="{{randOrder}}">
 																	<input type="hidden" name="cellCount" value="{{cellCount}}">
 																	<div class="quLogicInputCase">
-																		<input type="hidden" name="quLogicItemNum" value="{{questionLogics.length}}">
-																		{{#each questionLogics}}
+																		<input type="hidden" name="quLogicItemNum" value="{{questionLogic.length}}">
+																		{{#each questionLogic}}
 																			<div class="quLogicItem quLogicItem_{{showIndex @index}}">
 																				<input type="hidden" name="quLogicId" value="{{id}}" />
 																				<input type="hidden" name="cgQuItemId" value="{{cgQuItemId}}" />
@@ -588,8 +588,8 @@
 																			<input type="hidden" name="randOrder" value="{{randOrder}}">
 																			<input type="hidden" name="cellCount" value="{{cellCount}}">
 																			<div class="quLogicInputCase">
-																				<input type="hidden" name="quLogicItemNum" value="{{questionLogics.length}}">
-																				{{#each questionLogics}}
+																				<input type="hidden" name="quLogicItemNum" value="{{questionLogic.length}}">
+																				{{#each questionLogic}}
 																					<div class="quLogicItem quLogicItem_{{showIndex @index}}">
 																						<input type="hidden" name="quLogicId" value="{{id}}" />
 																						<input type="hidden" name="cgQuItemId" value="{{cgQuItemId}}" />
@@ -648,8 +648,8 @@
 																					<input type="hidden" name="paramInt01" value="{{paramInt01}}">
 																					<input type="hidden" name="paramInt02" value="{{paramInt02}}">
 																					<div class="quLogicInputCase">
-																						<input type="hidden" name="quLogicItemNum" value="{{questionLogics.length}}">
-																						{{#each questionLogics}}
+																						<input type="hidden" name="quLogicItemNum" value="{{questionLogic.length}}">
+																						{{#each questionLogic}}
 																							<div class="quLogicItem quLogicItem_{{showIndex @index}}">
 																								<input type="hidden" name="quLogicId" value="{{id}}" />
 																								<input type="hidden" name="cgQuItemId" value="{{cgQuItemId}}" />
@@ -674,7 +674,7 @@
 																							</li>
 																							<li title="逻辑" class="dwQuLogic">
 																								<div class="dwQuIcon">
-																									<div class="quLogicInfo">{{questionLogics.length}}</div>
+																									<div class="quLogicInfo">{{questionLogic.length}}</div>
 																								</div>
 																							</li>
 																							<li title="删除" class="dwQuDelete">
@@ -739,8 +739,8 @@
 																							<input type="hidden" name="randOrder" value="{{randOrder}}">
 																							<input type="hidden" name="cellCount" value="{{cellCount}}">
 																							<div class="quLogicInputCase">
-																								<input type="hidden" name="quLogicItemNum" value="${fn:length(en.questionLogics)}}">
-																								{{#each questionLogics}}
+																								<input type="hidden" name="quLogicItemNum" value="${fn:length(en.questionLogic)}}">
+																								{{#each questionLogic}}
 																									<div class="quLogicItem quLogicItem_{{showIndex @index}}">
 																										<input type="hidden" name="quLogicId" value="{{id}}" />
 																										<input type="hidden" name="cgQuItemId" value="{{cgQuItemId}}" />
@@ -765,7 +765,7 @@
 																									</li>
 																									<li title="逻辑" class="dwQuLogic">
 																										<div class="dwQuIcon">
-																											<div class="quLogicInfo">{{questionLogics.length}}</div>
+																											<div class="quLogicInfo">{{questionLogic.length}}</div>
 																										</div>
 																									</li>
 																									<li title="删除" class="dwQuDelete">
@@ -853,8 +853,8 @@
 																									<input type="hidden" name="randOrder" value="{{randOrder}}">
 																									<input type="hidden" name="cellCount" value="{{cellCount}}">
 																									<div class="quLogicInputCase">
-																										<input type="hidden" name="quLogicItemNum" value="{{questionLogics.length}}">
-																										{{#each questionLogics}}
+																										<input type="hidden" name="quLogicItemNum" value="{{questionLogic.length}}">
+																										{{#each questionLogic}}
 																											<div class="quLogicItem quLogicItem_{{showIndex @index}}">
 																												<input type="hidden" name="quLogicId" value="{{id}}" />
 																												<input type="hidden" name="cgQuItemId" value="{{cgQuItemId}}" />
@@ -879,7 +879,7 @@
 																											</li>
 																											<li title="逻辑" class="dwQuLogic">
 																												<div class="dwQuIcon">
-																													<div class="quLogicInfo">{{questionLogics.length}}</div>
+																													<div class="quLogicInfo">{{questionLogic.length}}</div>
 																												</div>
 																											</li>
 																											<li title="删除" class="dwQuDelete">
@@ -967,8 +967,8 @@
 																											<input type="hidden" name="randOrder" value="{{randOrder}}">
 																											<input type="hidden" name="cellCount" value="{{cellCount}}">
 																											<div class="quLogicInputCase">
-																												<input type="hidden" name="quLogicItemNum" value="{{questionLogics.length}}">
-																												{{#each questionLogics}}
+																												<input type="hidden" name="quLogicItemNum" value="{{questionLogic.length}}">
+																												{{#each questionLogic}}
 																													<div class="quLogicItem quLogicItem_{{showIndex @index}}">
 																														<input type="hidden" name="quLogicId" value="{{id}}" />
 																														<input type="hidden" name="cgQuItemId" value="{{cgQuItemId}}" />
@@ -993,7 +993,7 @@
 																													</li>
 																													<li title="逻辑" class="dwQuLogic">
 																														<div class="dwQuIcon">
-																															<div class="quLogicInfo">{{questionLogics.length}}</div>
+																															<div class="quLogicInfo">{{questionLogic.length}}</div>
 																														</div>
 																													</li>
 																													<li title="删除" class="dwQuDelete">
@@ -1081,8 +1081,8 @@
 																													<input type="hidden" name="randOrder" value="{{randOrder}}">
 																													<input type="hidden" name="cellCount" value="{{cellCount}}">
 																													<div class="quLogicInputCase">
-																														<input type="hidden" name="quLogicItemNum" value="{{questionLogics.length}}">
-																														{{#each questionLogics}}
+																														<input type="hidden" name="quLogicItemNum" value="{{questionLogic.length}}">
+																														{{#each questionLogic}}
 																															<div class="quLogicItem quLogicItem_{{showIndex @index}}">
 																																<input type="hidden" name="quLogicId" value="{{id}}" />
 																																<input type="hidden" name="cgQuItemId" value="{{cgQuItemId}}" />
@@ -1194,8 +1194,8 @@
 																															<input type="hidden" name="paramInt01" value="{{paramInt01}}">
 																															<input type="hidden" name="paramInt02" value="{{paramInt02}}">
 																															<div class="quLogicInputCase">
-																																<input type="hidden" name="quLogicItemNum" value="{{questionLogics.length}}">
-																																{{#each questionLogics}}
+																																<input type="hidden" name="quLogicItemNum" value="{{questionLogic.length}}">
+																																{{#each questionLogic}}
 																																	<div class="quLogicItem quLogicItem_{{showIndex @index}}">
 																																		<input type="hidden" name="quLogicId" value="{{id}}" />
 																																		<input type="hidden" name="cgQuItemId" value="{{cgQuItemId}}" />
@@ -1220,7 +1220,7 @@
 																																	</li>
 																																	<li title="逻辑" class="dwQuLogic">
 																																		<div class="dwQuIcon">
-																																			<div class="quLogicInfo">{{questionLogics.length}}</div>
+																																			<div class="quLogicInfo">{{questionLogic.length}}</div>
 																																		</div>
 																																	</li>
 																																	<li title="删除" class="dwQuDelete">