媒体端数据报表的更新

Signed-off-by: you.chen <you.chen@cloudcross.com>

src/main/java/com/cloudcross/ssp/model/mapper/zone.sql.xml

@@ -194,7 +194,8 @@
       
       <!-- add by Wanfu for banner-audit -->
       <select id="findByOperatorIdOperator" resultType="com.cloudcross.ssp.model.Zone" parameterType="int">
-           select * from t_zone where operator_id = #{operatorId} and recheck = 1 and status=0
+           select * from t_zone where 
+           operator_id = #{operatorId} and status != -1
       </select>
       
 	
@@ -209,7 +210,7 @@
 	
 	<select id="findByOperatorIdBack" resultType="com.cloudcross.ssp.model.Zone" parameterType="long">
            select <include refid="base_column" /> 
-           from t_zone where operator_id = #{operatorId}
+           from t_zone where operator_id = #{operatorId} and status != -1
       </select>
       
       

src/main/java/com/cloudcross/ssp/service/impl/ZoneService.java

@@ -154,9 +154,14 @@ import com.cloudcross.ssp.web.widget.SelectorController.ISelectorProvider;
 
 	@Override
 	public Map<String, List<? extends ISelector>> provideData(String[] parentId) {
+		Integer operatorId = null;
+		if(null == parentId[0] || "".equals(parentId[0])) {
+			operatorId = -1;
+		}
 //		Assert.isTrue(ArrayUtils.isNotEmpty(parentId));
-		Integer operatorId = Integer.parseInt(parentId[0]);
-		List<Zone> zoneList = findByOperatorId(operatorId);
+		operatorId = Integer.parseInt(parentId[0]);
+		List<Zone> zoneList = null;
+		zoneList = findByOperatorId(operatorId);
 		return MapBuilder.create(HashMap.class).add("zoneList", zoneList).map();
 	}
 	//operatorId类型居然搞不一样
@@ -173,12 +178,6 @@ import com.cloudcross.ssp.web.widget.SelectorController.ISelectorProvider;
 		return myBatisDao.getList("zoneSqlMapper.findByOperatorIdBack", operatorId);
 	}
 
-	@Override
-	public List<Zone> findByOperatorId(Long operatorId) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 	@Override
 	public Map<String, List<? extends ISelector>> provideDataBack(
 			String[] parentId) {
@@ -195,6 +194,12 @@ import com.cloudcross.ssp.web.widget.SelectorController.ISelectorProvider;
 	public List<Zone> queryZoneByAdgroupId(Long adgroupId) {
 		return myBatisDao.getList("zoneSqlMapper.queryZoneByAdgroupId", adgroupId);
 	}
+
+	@Override
+	public List<Zone> findByOperatorId(Long operatorId) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 	
 
 }

src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report.ftl

@@ -45,7 +45,7 @@
 					</ul>
 					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
 					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
-					<ul id="main_zoneListUl">
+					<ul id="main_zoneListUl" class="zoneList_back">
 						<li class="select_box" id="zoneListUl_box">
 							<span id="zoneListUl_span">${selectedZoneName!}</span>
 							<ul class="son_ul" id="son_zoneListUl"></ul>

src/main/webapp/assets/js/common/dropDownList.js

@@ -163,7 +163,12 @@ $(document).ready(function() {
  			$("#zoneListUl_span").text("全部广告位");
  		}
  		$("#son_zoneListUl").hide();
- 		var url = ctx+"/widget/selector/provide/zone?parentId="+$("#sessionoperatorId").val();
+ 		var url = "";
+ 		if($(".zoneList_back").html()){
+ 			url = ctx+"/widget/selector/provide/zone?parentId="+$("#selectedOperatorId").val();
+ 		}else{
+ 			url = ctx+"/widget/selector/provide/zone?parentId="+$("#sessionoperatorId").val();
+ 		}
  		getSelectData1("zoneListUl_span","son_zoneListUl","zoneListUl_box",-1,"全部广告位",url,"zoneList",null);
  		$('ul#son_zoneListUl li').live("click",function(){
  	 		$(this).parents('li').find('span').text($(this).text());

src/main/webapp/assets/js/report_back.js

@@ -80,6 +80,7 @@ $(document).ready(function(){
 		try{
 		  	var d=document.getElementsByName("hr");
 		  	var c=[];
+		  	
 		  	for(i=0;i<=d.length;i++){
 		  		c[i]=d[i].childNodes[0].nodeValue;
 		  	}