排序题选项删除完成

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

@@ -336,4 +336,20 @@ public class DwSurveyDirectoryController {
 		dwSurveyDirectoryService.deleteQuestionScoreOptionMationById(inputObject, outputObject);
 	}
 	
+	/**
+	 * 
+	     * @Title: deleteQuestionOrderOptionMationById
+	     * @Description: 删除排序选项
+	     * @param @param inputObject
+	     * @param @param outputObject
+	     * @param @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/DwSurveyDirectoryController/deleteQuestionOrderOptionMationById")
+	@ResponseBody
+	public void deleteQuestionOrderOptionMationById(InputObject inputObject, OutputObject outputObject) throws Exception{
+		dwSurveyDirectoryService.deleteQuestionOrderOptionMationById(inputObject, outputObject);
+	}
+	
 }

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

@@ -100,4 +100,10 @@ public interface DwSurveyDirectoryDao {
 
 	public int deleteLogicQuestionScoreOptionMationById(Map<String, Object> map) throws Exception;
 
+	public Map<String, Object> queryQuestionOrderOptionById(Map<String, Object> map) throws Exception;
+
+	public int deleteQuestionOrderOptionMationById(Map<String, Object> map) throws Exception;
+
+	public int deleteLogicQuestionOrderOptionMationById(Map<String, Object> map) throws Exception;
+
 }

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

@@ -45,4 +45,6 @@ public interface DwSurveyDirectoryService {
 
 	public void deleteQuestionScoreOptionMationById(InputObject inputObject, OutputObject outputObject) throws Exception;
 
+	public void deleteQuestionOrderOptionMationById(InputObject inputObject, OutputObject outputObject) throws Exception;
+
 }

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

@@ -939,6 +939,29 @@ public class DwSurveyDirectoryServiceImpl implements DwSurveyDirectoryService{
 			}
 		}
 	}
+
+	/**
+	 * 
+	     * @Title: deleteQuestionOrderOptionMationById
+	     * @Description: 删除排序选项
+	     * @param @param inputObject
+	     * @param @param outputObject
+	     * @param @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@Override
+	public void deleteQuestionOrderOptionMationById(InputObject inputObject, OutputObject outputObject) throws Exception {
+		Map<String, Object> map = inputObject.getParams();
+		Map<String, Object> option = dwSurveyDirectoryDao.queryQuestionOrderOptionById(map);
+		if(option != null){
+			if(option.get("surveyState").toString().equals("0")){//设计状态
+				dwSurveyDirectoryDao.deleteQuestionOrderOptionMationById(map);//执行物理删除
+			}else{//执行中或者结束
+				dwSurveyDirectoryDao.deleteLogicQuestionOrderOptionMationById(map);//执行逻辑删除问题
+			}
+		}
+	}
 	
 	
 	

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

@@ -634,4 +634,36 @@
 			id = #{quItemId}
 	</delete>
 	
+	<select id="queryQuestionOrderOptionById" parameterType="java.util.Map" resultType="java.util.Map">
+		SELECT
+			a.id,
+			c.survey_state surveyState
+		FROM
+			dw_qu_orderby a,
+			dw_question b,
+			dw_survey_directory c
+		WHERE a.id = #{quItemId}
+		AND a.visibility = '1'
+		AND a.qu_id = b.id
+		AND b.visibility = '1'
+		AND c.visibility = '1'
+		AND b.belong_id = c.id
+	</select>
+	
+	<update id="deleteLogicQuestionOrderOptionMationById" parameterType="java.util.Map">
+		UPDATE dw_qu_orderby
+		<set>
+			visibility = '0',
+		</set>
+		WHERE id = #{quItemId}
+	</update>
+	
+	<delete id="deleteQuestionOrderOptionMationById" parameterType="java.util.Map">
+		DELETE
+		FROM
+			dw_qu_orderby
+		WHERE
+			id = #{quItemId}
+	</delete>
+	
 </mapper>
\ No newline at end of file

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

@@ -178,6 +178,9 @@
 	<url id="dwsurveydirectory020" path="/post/DwSurveyDirectoryController/deleteQuestionScoreOptionMationById" val="删除评分Score选项" allUse="1">
 		<property id="quItemId" name="quItemId" ref="required" var="选项id"/>
 	</url>
+	<url id="dwsurveydirectory021" path="/post/DwSurveyDirectoryController/deleteQuestionOrderOptionMationById" val="删除排序选项" allUse="1">
+		<property id="quItemId" name="quItemId" ref="required" var="选项id"/>
+	</url>
 	<!-- 问卷调查结束 -->
 	
 </controller>
\ No newline at end of file

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

@@ -2060,28 +2060,24 @@ layui.config({
 	    		$(this).text(i + 1);
 	    	});
 	    }
-	    /** 删除排序选项 **/
+	    /**
+	     * 删除排序选项
+	     */
 	    function deleteOrderquOption() {
 	    	var optionParent = null;
 	    	optionParent = $(curEditObj).parents("li.quCoItemUlLi");
 	    	var quItemBody = $(curEditObj).parents(".surveyQuItemBody");
 	    	var rmQuOrderTableTr = quItemBody.find(".quOrderByRight table.quOrderByTable tr:last");
-
 	    	var quOptionId = $(optionParent).find("input[name='quItemId']").val();
 	    	if(quOptionId != "" && quOptionId != "0") {
-	    		var url = reqBasePath + "/design/qu-orderqu!ajaxDelete.action";
-	    		var data = "quItemId=" + quOptionId;
-	    		$.ajax({
-	    			url: url,
-	    			data: data,
-	    			type: "post",
-	    			success: function(msg) {
-	    				if(msg == "true") {
-	    					delQuOptionCallBack(optionParent);
-	    					rmQuOrderTableTr.remove();
-	    				}
-	    			}
-	    		});
+	    		AjaxPostUtil.request({url:reqBasePath + "dwsurveydirectory021", params:{quItemId: quOptionId}, type:'json', callback:function(json){
+	 	   			if(json.returnCode == 0){
+	 	   				delQuOptionCallBack(optionParent);
+	 	   				rmQuOrderTableTr.remove();
+	 	   			}else{
+	 	   				top.winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
+	 	   			}
+	 	   		}});
 	    	} else {
 	    		delQuOptionCallBack(optionParent);
 	    		rmQuOrderTableTr.remove();