修改广告主行业，添加全选按钮

src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/AdvertiserController.java

@@ -138,6 +138,8 @@ public class AdvertiserController extends SimpleController {
 		//优化：可以用一条sql来查询（待做）
 		Advertiser advertiser = advertiserService.findById(id);
 		Industry industry = industryService.findByIndustryId(advertiser.getIndustryId());
+		model.addAttribute("industryFatherId", industry.getFatherId());
+		model.addAttribute("industryId", advertiser.getIndustryId());
 		model.addAttribute("industryName", industry.getName());
 		model.addAttribute("sessionid", request.getSession().getId());
 		model.addAttribute("advertiser", advertiser);
@@ -485,7 +487,7 @@ public class AdvertiserController extends SimpleController {
 	public String getAllFatherIndustry(Model model, @RequestParam(defaultValue = "1") int page,
 			@RequestParam Map<String, Object> paramMap) {
 		Integer count = this.industryService.conutAllFatherIndustry(paramMap);
-		Pager pager = new Pager();
+		Pager1 pager = new Pager1();
 		pager.setPage(page);
 		pager.setTotalRow(count);
 		paramMap.put("pager", pager);
@@ -505,16 +507,30 @@ public class AdvertiserController extends SimpleController {
 	public String getIndustry(Model model, @RequestParam(defaultValue = "1") int page,
 			@RequestParam Map<String, Object> paramMap) {
 		Integer count = this.industryService.countIndustryByFatherId(paramMap);
-		Pager pager = new Pager();
+		Pager1 pager = new Pager1();
 		pager.setPage(page);
 		pager.setTotalRow(count);
 		paramMap.put("pager", pager);
 		List<Industry> industryList = this.industryService.findIndustryByFatherId(paramMap);
 		model.addAttribute("pager", pager);
 		model.addAttribute("fatherId", "");
-		model.addAttribute("industryId", paramMap.get("industry"));
+		model.addAttribute("industryId", paramMap.get("fatherId"));
 		model.addAttribute("industryList", industryList);
 		return page("industry");	
 	}
+	
+	/**
+	 * 判断是否有子行业
+	 * @return
+	 */
+	@RequestMapping("/isExistIndustry")
+	@ResponseBody
+	public Boolean isExistIndustry(Model model,@RequestParam Map<String, Object> paramMap) {
+		Integer count = this.industryService.countIndustryByFatherId(paramMap);
+		if(count == 0){
+			return true;
+		}
+		return 	false;
+	}
 
 }

src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/create.ftl

@@ -37,6 +37,7 @@
 					<label class="input-label"><span class="lbl-yes">*</span>广告主行业：</label>
 					<a id="selectIndustry" class="btn2">选择</a><span class="spanVaildate"></span><span id="selectIndustry_span"></span>
 					<input type="hidden" id="industryFatherId" value=""/>
+					<input type="hidden" id="industryName" name="industryName" value=""/>
 					<input type="hidden" id="industryId" name="industryId" value=""/>
 				</div>
 				<div class="input-group">

src/main/webapp/WEB-INF/pages/advertiser/main/ad/advertiser/edit.ftl

@@ -9,6 +9,7 @@
 <script type="text/javascript" src="${ctx}/assets/js/common/uploadFile.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/common/dropDownList.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/advertiser/advertiser.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/layer/layer.js"></script>
 </@override>	
 <@override name="body">
 <div id=content_bg>
@@ -34,15 +35,10 @@
 				</div>
 				<div class="input-group" id="industryul_selectdiv">
 					<label class="input-label"><span class="lbl-yes">*</span>广告主行业：</label>
-					<span class="spanVaildate_ul"></span>
-					<ul id="main_industryul">
-						<li class="select_box" id="industryul_select_box">
-						   	<span id="industryul_span">${industryName!}</span>
-						    <ul class="son_ul" id="industry_son_ul"></ul>
-						</li>
-					</ul>
-					<input type="hidden" id="industryId" name="industryId" value="${advertiser.industryId!}"/>
+					<a id="selectIndustry" class="btn2">选择</a><span class="spanVaildate"></span><span id="selectIndustry_span">已选择 —— ${industryName!}</span>
+					<input type="hidden" id="industryFatherId" value="${industryFatherId!}"/>
 					<input type="hidden" id="industryName" name="industryName" value="${industryName!}"/>
+					<input type="hidden" id="industryId" name="industryId" value="${industryId!}"/>
 				</div>
 				<div class="input-group">
 					<label class="input-label"><span class="lbl-yes">*</span>公司注册名：</label>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group-alloperator/operatorPlaceWindow.ftl

@@ -6,6 +6,10 @@
 <div id="dialog_content">
 	<form id="selectOperatorPlaceForm" action="${ctx}/advertiser/main/ad/target/ad-group-alloperator/chooseOperatorPlace" method="post">
 		<input type="hidden" id="page" name="page" value="${pager.page}">
+		<div id="buttons">
+			<button id="selectOperatorPlaceAll" class="btn2"/>全选</button>
+			<button id="notselectOperatorPlaceAll" class="btn2">全不选</button>
+		</div>
 		<div id="selectOperatorPlaceDiv" class="input-radiosDiv">
 			<#if list ??>
 			<#list list as operatorPlace>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group-alloperator/operatorWindow.ftl

@@ -6,6 +6,10 @@
 <div id="dialog_content">
 	<form id="selectOperatorForm" action="${ctx}/advertiser/main/ad/target/ad-group-alloperator/chooseOperator" method="post">
 		<input type="hidden" id="page" name="page" value="${pager.page}">
+		<div id="buttons">
+			<button id="selectOperatorAll" class="btn2"/>全选</button>
+			<button id="notselectOperatorAll" class="btn2">全不选</button>
+		</div>
 		<div id="selectOperatorDiv" class="input-radiosDiv">
 			<#if operatorList ??>
 			<#list operatorList as operator>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group-alloperator/placeClassWindow.ftl

@@ -6,6 +6,10 @@
 <div id="dialog_content">
 	<form id="selectPlaceClassForm" action="${ctx}/advertiser/main/ad/target/ad-group-alloperator/choosePlaceClass" method="post">
 		<input type="hidden" id="page" name="page" value="${pager.page}">
+		<div id="buttons">
+			<button id="selectPlaceClassAll" class="btn2"/>全选</button>
+			<button id="notselectPlaceClassAll" class="btn2">全不选</button>
+		</div>
 		<div id="selectPlaceClassDiv" class="input-radiosDiv">
 			<#if list ??>
 			<#list list as placeClass>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group-alloperator/placeWindow.ftl

@@ -6,6 +6,10 @@
 <div id="dialog_content">
 	<form id="selectPlaceClassForm" action="${ctx}/advertiser/main/ad/target/ad-group-alloperator/choosePlace" method="post">
 		<input type="hidden" id="page" name="page" value="${pager.page}">
+		<div id="buttons">
+			<button id="selectPlaceAll" class="btn2"/>全选</button>
+			<button id="notselectPlaceAll" class="btn2">全不选</button>
+		</div>
 		<div id="selectPlaceDiv" class="input-radiosDiv">
 			<#if list ??>
 			<#list list as place>

src/main/webapp/WEB-INF/pages/operator/main/ad/zone/industry.ftl

@@ -1,6 +1,7 @@
 <@override name="head">	
 <link rel="stylesheet" href="${ctx}/assets/css/dialog_adGroup.css"/>
 <script type="text/javascript" src="${ctx}/assets/js/operator/zone_dialog.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/zone_dialog.js"></script>
 </@override>	
 <@override name="body">
 <div id="dialog_content">
@@ -8,6 +9,10 @@
 		<input type="hidden" id="page" name="page" value="${pager.page}"/>
 		<input type="hidden" id="fatherId" name="fatherId" value="${fatherId!}"/>
 		<input type="hidden" id="industryId" name="industryId" value="${industryId!}"/>
+		<div id="buttons">
+			<button id="selectAll" class="btn2"/>全选</button>
+			<button id="notselectAll" class="btn2">全不选</button>
+		</div>
 		<div id="selectZoneIndustryDiv" class="input-radiosDiv">
 			<#if industryList ??>
 			<#list industryList as industry>
@@ -18,12 +23,14 @@
 			</#list>
 			</#if>
 		</div>
+		<!-- 暂时去掉分页
 		<div id="pageDiv_dialog">
 			<#include "/common/pagination/simple.ftl"/>
 		</div>
+		-->
 		<div id="btnDiv_dialog">
 			<input id="btn_formSubmit" class="industry_save" type="submit" value="保存"/>
-		<div>
+		</div>
 	</form>
 </div>
 </@override>

src/main/webapp/assets/css/dialog_adGroup.css

@@ -74,9 +74,25 @@ table.tableFig td,table.tableFigOther td{
 	width: 100%;
 	border:thin solid #b9c5d9;
 	display: inline-block;
+	height: 41px;
+    overflow: hidden;
 }
 
 #selectIndustryDiv .single_div input[type="radio"]:checked + label{
 	background-color: #4C637B;
 	color: #fff;
+}
+
+#selectZoneIndustryDiv .single_div span.single_div_span{
+    width: 170px;
+    margin-right: 20px;
+}
+
+#buttons{
+	margin-bottom:20px;
+}
+
+#buttons .btn2{
+	width:90px;
+	line-height: 30px;
 }

src/main/webapp/assets/js/advertiser/advertiser_dialog.js

@@ -14,14 +14,27 @@ $(document).ready(function(){
 		parent.layer.title("选择父行业");
 		$('.industry_save').addClass("industry_change");
 	}
+	if((parent.$('#industryFatherId').val() == "" || parent.$('#industryFatherId').val() == 0)
+			&& parent.$('#industryId').val() != ""){
+		$('.industry_oper').addClass("industry_change");
+		$('.industry_save').removeClass("industry_change");
+	}
 	
 	$(".industry_oper").click(function(){
 		if($(this).val() == "下一步"){
 			var industryId = $("#selectIndustryDiv input[name='industry']:checked").val();
+			var industryName = $("#selectIndustryDiv input[name='industry']:checked").attr("title");
 			if(industryId == undefined){
-				alert("请选择父行业之后，在进行下一步操作！");
-				return false;
+				if(parent.$('#industryFatherId').val() != ""){
+					industryId = parent.$('#industryFatherId').val();
+					industryName = parent.$('#industryName').val();
+				}else{
+					alert("请选择父行业之后，在进行下一步操作！");
+					return false;
+				}
 			}
+			parent.$('#industryFatherId').val(industryId);
+			parent.$('#industryName').val(industryName);
 			$("#fatherId").val(parseInt(industryId));
 			$("#selectIndustryForm").attr("action", "getIndustry");
 			$('#selectIndustryForm').submit();
@@ -33,20 +46,30 @@ $(document).ready(function(){
 	
 	$(".industry_save").click(function(){
 		var industryId = $("#selectIndustryDiv input[name='industry']:checked").val();
+		var industryName = $("#selectIndustryDiv input[name='industry']:checked").attr("title");
 		if(industryId == undefined){
-			alert("请选择行业！");
-			return false;
+			if(parent.$('#industryId').val() != ""){
+				industryId = parent.$('#industryId').val();
+				industryName = parent.$('#industryName').val();
+			}else{
+				alert("请选择行业！");
+				return false;
+			}
 		}
-		parent.$('#industryFatherId').val($("#industryId").val());
 		parent.$('#industryId').val(industryId);
-		parent.$("#selectIndustry_span").text("已选择行业 —— "+ $("#selectIndustryDiv input[name='industry']:checked").attr("title"));
+		parent.$('#industryName').val(industryName);
+		parent.$("#selectIndustry_span").text("已选择 —— "+ industryName);
 		parent.$("#industryul_selectdiv").find('span.spanVaildate').html("");
 		parent.layer.close(index);//再执行关闭
 	});
 	
 	$("#selectIndustryDiv input[name='industry']").each(function(){
 		if($(this).val() == $('#fatherId').val() || $(this).val() == $('#industryId').val() || 
-				$(this).val() == parent.$('#industryFatherId').val() || $(this).val() == parent.$('#industryId').val()){
+				$(this).val() == parent.$('#industryFatherId').val()){
+			$(this).attr('checked',true);
+			judgeIssave($(this).val());
+		}
+		if($(this).val() == parent.$('#industryId').val()){
 			$(this).attr('checked',true);
 		}
 	});
@@ -55,9 +78,12 @@ $(document).ready(function(){
 		if($(".industry_oper").val() == "下一步"){
 			$('#industryId').val($(this).val());
 			$("#fatherId").val($(this).val());
+			parent.$('#industryId').val("");
+			parent.$('#industryFatherId').val("");
 		}else if($(".industry_oper").val() == "上一步"){
 			$("#fatherId").val($(this).val());
 		}
+		judgeIssave($(this).val());
 	});
 	
 	// 分页中超链接跳转
@@ -67,4 +93,16 @@ $(document).ready(function(){
 		$('#selectIndustryForm').submit();
 	});
 
-});
+});
+
+function judgeIssave(fatherId){
+	$.post('isExistIndustry',{fatherId:fatherId},function(data){
+		if(data == false){
+			$('.industry_oper').removeClass("industry_change");
+			$('.industry_save').addClass("industry_change");
+		}else{
+			$('.industry_save').removeClass("industry_change");
+			$('.industry_oper').addClass("industry_change");
+		}
+	});
+}

src/main/webapp/assets/js/advertiser/operatoradAllGroup.js

@@ -516,7 +516,7 @@ $(document).ready(function(){
 			shadeClose: false,
 			shade: 0.6,
 			fix:false,
-			area: ['680px','430px'],
+			area: ['680px','436px'],
 			content: [ctx+'/advertiser/main/ad/target/ad-group-alloperator/chooseOperator', 'no']
 		}); 
 	});
@@ -534,7 +534,7 @@ $(document).ready(function(){
 				shadeClose: false,
 				shade: 0.6,
 				fix:false,
-				area: ['680px','430px'],
+				area: ['680px','436px'],
 				content: [ctx+'/advertiser/main/ad/target/ad-group-alloperator/chooseOperatorPlace', 'no']
 			}); 
 		}
@@ -553,7 +553,7 @@ $(document).ready(function(){
 				shadeClose: false,
 				shade: 0.6,
 				fix:false,
-				area: ['680px','430px'],
+				area: ['680px','436px'],
 				content: [ctx+'/advertiser/main/ad/target/ad-group-alloperator/choosePlace', 'no']
 			}); 
 		}
@@ -572,7 +572,7 @@ $(document).ready(function(){
 				shadeClose: false,
 				shade: 0.6,
 				fix:false,
-				area: ['680px','430px'],
+				area: ['680px','436px'],
 				content: [ctx+'/advertiser/main/ad/target/ad-group-alloperator/choosePlaceClass', 'no']
 			}); 
 		}

src/main/webapp/assets/js/advertiser/operatoradAllGroup_dialog.js

@@ -139,6 +139,18 @@ $(document).ready(function(){
 		$('#selectPlaceClassForm').submit();
 	});
 	
+	// 全选
+	$('#selectOperatorAll,#selectOperatorPlaceAll,#selectPlaceAll,#selectPlaceClassAll').click(function(){
+		$(".input-radiosDiv input[type='checkbox']").attr("checked",true);
+		return false;
+	});
+	
+	// 全不选
+	$('#notselectOperatorAll,#notselectOperatorPlaceAll,#notselectPlaceAll,#notselectPlaceClassAll').click(function(){
+		$(".input-radiosDiv input[type='checkbox']").attr("checked",false);
+		return false;
+	});
+	
 /***************************    选择终端    ***************************/
 	
 	$(".selectWifi_save").click(function(){

src/main/webapp/assets/js/operator/zone.js

@@ -205,7 +205,6 @@ $(document).ready(function(){
 		var obj = $(this);
 		$("#industryFatherName").val(this.innerHTML);
 		$.post(ctx+'/operator/main/ad/zone/isExistIndustry',{fatherId:$(this).attr("value")},function(data){
-			
 			if(data == false){
 				layer.open({
 				    type: 2,
@@ -213,8 +212,8 @@ $(document).ready(function(){
 					shadeClose: false,
 					shade: 0.6,
 					fix:false,
-					area: ['680px','430px'],
-					content: [ctx+'/operator/main/ad/zone/getIndustry?fatherId='+obj.attr("value"), 'no']
+					area: ['685px','430px'],
+					content: [ctx+'/operator/main/ad/zone/getIndustry?fatherId='+obj.attr("value")]
 				});
 				return false;
 			}else{

src/main/webapp/assets/js/operator/zone_dialog.js

@@ -45,4 +45,15 @@ $(document).ready(function(){
 		$('#selectZoneIndustryForm').submit();
 	});
 
+	// 全选
+	$('#selectAll').click(function(){
+		$("#selectZoneIndustryDiv input[type='checkbox']").attr("checked",true);
+		return false;
+	});
+	
+	// 全不选
+	$('#notselectAll').click(function(){
+		$("#selectZoneIndustryDiv input[type='checkbox']").attr("checked",false);
+		return false;
+	});
 });