素材审核更新operator

Signed-off-by: jiapeng.dong <jiapeng.dong@cloudcross.com>

src/main/java/com/cloudcross/ssp/model/AuditBanner.java

@@ -32,6 +32,8 @@ public class AuditBanner {
 	private Date updated;
 	//审核备注
 	private String memo;
+	//运营商审核状态
+	private Integer operatorChecked;
 	//行业
 	private String industryName;
 	//广告主
@@ -104,6 +106,12 @@ public class AuditBanner {
 	public void setMemo(String memo) {
 		this.memo = memo;
 	}
+	public Integer getOperatorChecked() {
+		return operatorChecked;
+	}
+	public void setOperatorChecked(Integer operatorChecked) {
+		this.operatorChecked = operatorChecked;
+	}
 	public String getIndustryName() {
 		return industryName;
 	}
@@ -130,9 +138,9 @@ public class AuditBanner {
 				+ visitAddress + ", clickAddress=" + clickAddress
 				+ ", impressionAddress=" + impressionAddress + ", checked="
 				+ checked + ", updated=" + updated + ", memo=" + memo
-				+ ", industryName=" + industryName + ", advertiserName="
-				+ advertiserName + ", bannerTemplate=" + bannerTemplate + "]";
+				+ ", operatorChecked=" + operatorChecked + ", industryName="
+				+ industryName + ", advertiserName=" + advertiserName
+				+ ", bannerTemplate=" + bannerTemplate + "]";
 	}
 	
-	
 }

src/main/java/com/cloudcross/ssp/model/Banner.java

@@ -36,8 +36,7 @@ public class Banner {
 	private Date supdated;
 	//创建bannerTemplate对象
 	BannerTemplate bannerTemplate;
-	//运营商审核状态
-	private Integer operatorChecked;
+
 		
 	public Long getId() {
 		return id;
@@ -123,12 +122,6 @@ public class Banner {
 	public void setBannerTemplate(BannerTemplate bannerTemplate) {
 		this.bannerTemplate = bannerTemplate;
 	}
-	public Integer getOperatorChecked() {
-		return operatorChecked;
-	}
-	public void setOperatorChecked(Integer operatorChecked) {
-		this.operatorChecked = operatorChecked;
-	}
 	@Override
 	public String toString() {
 		return "Banner [id=" + id + ", bannerTemplateId=" + bannerTemplateId
@@ -137,11 +130,8 @@ public class Banner {
 				+ ", clickAddress=" + clickAddress + ", impressionAddress="
 				+ impressionAddress + ", checked=" + checked + ", memo=" + memo
 				+ ", status=" + status + ", updated=" + updated + ", supdated="
-				+ supdated + ", bannerTemplate=" + bannerTemplate
-				+ ", operatorChecked=" + operatorChecked + "]";
+				+ supdated + ", bannerTemplate=" + bannerTemplate + "]";
 	}
-	
-	
-	
+
 	
 }

src/main/java/com/cloudcross/ssp/model/mapper/audit-banner.sql.xml

@@ -1,18 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="auditBannerSqlMapper">
-	<sql id="base_column">
-		id,
-		banner_template_id as bannerTemplateId,
-		order_id as orderId,
-		campaign_id as campaignId,
-		adgroup_id as adGroupId,
-		visit_address as visitAddress,
-		click_address as clickAddress,
-		impression_address as impressionAddress
-		checked,
-		updated,
-		memo
+	<sql id="base_column_banner">
+		 a.id as id,
+		 a.banner_template_id as bannerTemplateId,
+		 a.order_id as orderId,
+		 a.campaign_id as campaignId,
+		 a.adgroup_id as adGroupId,
+		 a.visit_address as visitAddress,
+		a.click_address as clickAddress,
+		a.impression_address as impressionAddress,
+		a.status as status1,
+		a.checked as checked,
+		a.updated as updated,
+		a.supdated as supdated,
+		a.memo as memo
+	</sql>
+	<sql id="base_column_bannertemplate">
+		b.id as bannerTemplateId,
+		b.agent_id as agentId,
+		b.advertiser_id as advertiserId,
+		b.agent_id as agentId,
+		b.name as name,
+		b.path as path,
+		b.path_small as pathSmall,
+		b.type as type,
+		b.width as width,
+		b.height as height,
+		b.status as status,
+		b.updated as updated	
 	</sql>
 	
 	<select id="countByParams" parameterType="map" resultType="int">
@@ -35,9 +51,8 @@
 	
 	<select id="findByParams" parameterType="map" resultMap="AuditBanner">  
 	
-	select a.id as id,a.banner_template_id as bannerTemplateId,a.order_id as orderId,a.campaign_id as campaignId,a.adgroup_id as adGroupId,a.visit_address as visitAddress,a.click_address as clickAddress,a.impression_address as impressionAddress,
-	a.checked as checked,a.updated as updated,a.memo as memo,
-	b.id as bannerTemplateId,b.advertiser_id as advertiserId,b.name as name,b.path as path,b.path_small as pathSmall,b.type as type,b.width as width,b.height as height,b.status as status,b.updated as updated ,
+	select <include refid="base_column_banner"/> ,
+		<include refid="base_column_bannertemplate"/>
 (select	name from t_advertiser where id=b.advertiser_id) as advertiserName,(select name from t_industry where id = (select industry_id from t_advertiser where id=b.advertiser_id)) as industryName from t_banner a
     left join t_banner_template b on a.banner_template_id=b.id
 	left join t_order c on a.order_id= c.id
@@ -62,9 +77,8 @@
 	
 	<select id="findAudit" parameterType="map" resultMap="AuditBanner">  
 	
-	select a.id as id,a.banner_template_id as bannerTemplateId,a.order_id as orderId,a.campaign_id as campaignId,a.adgroup_id as adGroupId,a.visit_address as visitAddress,a.click_address as clickAddress,a.impression_address as impressionAddress,
-	a.checked as checked,a.updated as updated,a.memo as memo,
-	b.id as bannerTemplateId,b.advertiser_id as advertiserId,b.name as name,b.path as path,b.path_small as pathSmall,b.type as type,b.width as width,b.height as height,b.status as status,b.updated as updated ,
+	select <include refid="base_column_banner"/> ,
+		<include refid="base_column_bannertemplate"/>
 	(select	name from t_advertiser where id=b.advertiser_id) as advertiserName,(select name from t_industry where id = (select industry_id from t_advertiser where id=b.advertiser_id)) as industryName from t_banner a
     left join t_banner_template b on a.banner_template_id=b.id
 	left join t_order c on a.order_id= c.id
@@ -98,6 +112,7 @@
     <result property="checked" column="checked"/>
     <result property="updated" column="updated"/> 
      <result property="memo" column="memo"/>
+     <result property="operatorChecked" column="operatorChecked"/>
      <result property="industryName" column="industryName"/>
      <result property="advertiserName" column="advertiserName"/>
     <association property="bannerTemplate" javaType="com.cloudcross.ssp.model.BannerTemplate" resultMap="bannerTemplate"/>
@@ -140,4 +155,165 @@
 		</foreach>
 	</update>
 	
+	
+		<select id="countByZoneSizeOperator" parameterType="HashMap" resultType="int">
+		select count(*) 
+		from t_banner a 
+		inner join t_banner_template b
+		on a.banner_template_id = b.id 
+		where b.status != -1 
+		and checked != 2 
+		and checked !=0
+	   	<if test="zoneList.size()>0">
+			and
+		   	<foreach item="zone" collection="zoneList"
+		   		 open="(" separator="or" close=")" >
+			      b.width &lt;= #{zone.width} and b.height &lt;= #{zone.height}
+			</foreach>
+		</if>
+		<if test="searchKey!=null and searchValue!=null">
+			and b.name like #{searchValue}
+		</if>
+		<if test="checked!=null">
+			and a.checked like #{checked}
+		</if>
+	</select>
+	
+	<select id="findByZoneSizeOperator" parameterType="HashMap" resultMap="AuditBanner">  
+		select <include refid="base_column_banner"/> ,
+		<include refid="base_column_bannertemplate"/>,
+		IFNULL(bo.checked,-1) as operatorChecked
+		from t_banner a 
+		inner join t_banner_template b
+		on a.banner_template_id = b.id
+		where b.status != -1 
+		and checked != 2 
+		and checked !=0
+		<if test="zoneList.size()>0">
+			and
+		   	<foreach item="zone" collection="zoneList"
+		   		 open="(" separator="or" close=")" >
+			      b.width &lt;= #{zone.width} and b.height &lt;= #{zone.height}
+			</foreach>
+		</if>
+	   	<if test="searchKey!=null and searchValue!=null">
+			and b.name like #{searchValue}
+		</if>
+		<if test="checked!=null">
+			and a.checked like #{checked}
+		</if>
+	    order by  a.id   desc
+	    <if test="pager!=null">
+		limit #{pager.offset}, #{pager.limit}
+		</if>
+	</select>
+	
+	<select id="findByIdOperator" parameterType="int" resultMap="AuditBanner">  
+		select <include refid="base_column_banner"/> ,
+		<include refid="base_column_bannertemplate"/>,
+		IFNULL(bo.checked,-1) as operatorChecked
+		from t_banner a 
+		inner join t_banner_template b 
+		on a.banner_template_id = b.id 
+		left join t_banner_operator bo
+		on a.id=bo.banner_id where a.id=#{id}
+	</select>
+
+<select id="countByOperator" parameterType="HashMap" resultType="int">
+		select count(*) 
+		from t_banner a 
+		inner join t_banner_template b 
+		on a.banner_template_id = b.id 
+		left join t_banner_operator bo
+		on a.id=bo.banner_id 
+		and bo.operator_id=#{operatorId}  
+		where a.status = 0 
+		and b.status = 0 
+		and a.checked = 1 
+	   	<if test="zoneList.size()>0">
+			and
+		   	<foreach item="zone" collection="zoneList"
+		   		 open="(" separator="or" close=")" >
+			      b.width &lt;= #{zone.width} and b.height &lt;= #{zone.height}
+			</foreach>
+		</if>
+		<if test="searchKey!=null and searchValue!=null">
+			and b.name like #{searchValue}
+		</if>
+		<if test="operatorChecked!=null">
+		<choose>
+			<when test="operatorChecked == 0">
+				and ISNULL(bo.checked) or bo.checked =0
+			</when>
+			<otherwise>
+				and bo.checked=#{operatorChecked}
+			</otherwise>	
+		</choose>
+		</if>
+	</select>
+	
+	<select id="findByOpertor" parameterType="HashMap" resultMap="AuditBanner">  
+		select <include refid="base_column_banner"/> ,
+		<include refid="base_column_bannertemplate"/>,
+		IFNULL(bo.checked,-1) as operatorChecked
+		from t_banner a 
+		inner join t_banner_template b
+		on a.banner_template_id = b.id 
+		left join t_banner_operator bo
+		on a.id=bo.banner_id 
+		and bo.operator_id=#{operatorId}  
+		where a.status = 0 
+		and b.status = 0 
+		and a.checked = 1
+		<if test="zoneList.size()>0">
+			and
+		   	<foreach item="zone" collection="zoneList"
+		   		 open="(" separator="or" close=")" >
+			      b.width &lt;= #{zone.width} and b.height &lt;= #{zone.height}
+			</foreach>
+		</if>
+	   	<if test="searchKey!=null and searchValue!=null">
+			and b.name like #{searchValue}
+		</if>
+		<if test="operatorChecked!=null">
+		<choose>
+			<when test="operatorChecked == 0">
+				and ISNULL(bo.checked) or bo.checked =0
+			</when>
+			<otherwise>
+				and bo.checked=#{operatorChecked}
+			</otherwise>	
+		</choose>
+		</if>
+	    order by  a.id   desc
+	    <if test="pager!=null">
+		limit #{pager.offset}, #{pager.limit}
+		</if>
+	</select>
+
+
+	<update id="updateBannerStatusOperator" parameterType="HashMap">
+		update t_banner 
+			set checked = #{checked},
+			updated = #{updated}
+			where id in
+			<foreach item="bannerId" collection="bannerIdList"
+		      open="(" separator="," close=")">
+		        #{bannerId}
+			</foreach>
+	</update>
+	
+	<insert id="addOperatorBanner" parameterType="HashMap">
+	insert into t_banner_operator 
+			(operator_id,banner_id,checked,supdated)
+			values(#{operatorId},#{bannerId},#{operatorChecked},#{supdated})
+		</insert>
+	
+	
+	<update id="updateOperatorBanner" parameterType="HashMap">
+		update t_banner_operator 
+			set operator_id=#{operatorId},checked = #{operatorChecked},supdated = #{supdated}
+			where banner_id = #{bannerId}
+	</update>
+	
 </mapper>

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

@@ -1,48 +1,67 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="bannerSqlMapper">
-	<sql id="base_column_advertiser">
-		id,
-		banner_template_id as bannerTemplateId,
-		order_id as orderId,
-		campaign_id as campaignId,
-		adgroup_id as adGroupId,
-		visit_address as visitAddress,
-		click_address as clickAddress,
-		impression_address as impressionAddress
-		status,
-		checked,
-		updated,
-		supdated
+
+	<sql id="base_column_banner">
+		 a.id as id,
+		 a.banner_template_id as bannerTemplateId,
+		 a.order_id as orderId,
+		 a.campaign_id as campaignId,
+		 a.adgroup_id as adGroupId,
+		 a.visit_address as visitAddress,
+		a.click_address as clickAddress,
+		a.impression_address as impressionAddress,
+		a.status as status1,
+		a.checked as checked,
+		a.updated as updated,
+		a.supdated as supdated,
+		a.memo as memo
 	</sql>
-	
-	<sql id="base_column_operator">
-		b.id as bannerId,
-		banner_template_id as bannerTemplateId,
-		order_id as orderId,
-		campaign_id as campaignId,
-		adgroup_id as adGroupId,
-		visit_address as visitAddress,
-		click_address as clickAddress,
-		impression_address as impressionAddress,
-		b.checked as checked,
-		IFNULL(bo.checked,-1) as operatorChecked,
-		b.updated as updated,
-		memo
+	<sql id="base_column_bannertemplate">
+		b.id as bannerTemplateId,
+		b.agent_id as agentId,
+		b.advertiser_id as advertiserId,
+		b.agent_id as agentId,
+		b.name as name,
+		b.path as path,
+		b.path_small as pathSmall,
+		b.type as type,
+		b.width as width,
+		b.height as height,
+		b.status as status,
+		b.updated as updated	
 	</sql>
 	
-	<sql id="banner_template_base_column">
-		bt.id as banner_templateId,
-		advertiser_id as advertiserId,
-		name,
-		path,
-		path_small as pathSmall,
-		type,
-		width,
-		height,
-		bt.status as status,
-		bt.updated as bannerTemplateUpdated
-	</sql>
+	
+	<resultMap type="com.cloudcross.ssp.model.Banner" id="Banner">
+	<id property="id" column="id"/>
+	  <result property="bannerTemplateId" column="bannerTemplateId"/> 
+	   <result property="status" column="status1"/>   
+	<result property="orderId" column="orderId"/>
+	<result property="campaignId" column="campaignId"/> 
+  	<result property="adGroupId" column="adGroupId"/>   
+    <result property="visitAddress" column="visitAddress"/> 
+    <result property="clickAddress" column="clickAddress"/> 
+    <result property="impressionAddress" column="impressionAddress"/>
+    <result property="checked" column="checked"/>
+    <result property="updated" column="updated"/>
+    <result property="supdated" column="supdated"/> 
+    <association property="bannerTemplate" javaType="com.cloudcross.ssp.model.BannerTemplate" resultMap="bannerTemplate"/>
+</resultMap>  
+<resultMap type="com.cloudcross.ssp.model.BannerTemplate" id="BannerTemplate">  
+   <id property="id" column="bannerTemplateId"/>  
+   <result property="advertiserId" column="advertiserId"/>
+   <result property="agentId" column="agentId"/>  
+   <result property="name" column="name"/>
+    <result property="path" column="path"/> 
+    <result property="pathSmall" column="pathSmall"/>
+   <result property="type" column="type"/>
+   <result property="width" column="width"/> 
+   <result property="height" column="height"/> 
+   <result property="status" column="status"/>   
+   <result property="updated" column="updated"/>     
+</resultMap>  
+
 	
 	<delete id="deleteBanner" parameterType="HashMap">
 		delete from t_banner where
@@ -55,24 +74,20 @@
 	
 	<update id="updateBannerStatus" parameterType="HashMap">
 		update t_banner 
-		set status=#{status},updated = #{updated},supdated = #{supdated} 
+		set status=#{status},
+		updated = #{updated},
+		supdated = #{supdated} 
 		where id in
 		<foreach item="id" collection="idList" open="(" separator=","
 			close=")">
 			#{id}
 		</foreach>
 	</update>
-	<update id="updateBannerStatusOperator" parameterType="HashMap">
-		update t_banner 
-			set checked = #{checked},updated = #{updated}
-			where id in
-			<foreach item="bannerId" collection="bannerIdList"
-		      open="(" separator="," close=")">
-		        #{bannerId}
-			</foreach>
-	</update>
+	
+	
 	<select id="countByParams" parameterType="map" resultType="int">
-	select count(a.id) from t_banner a ,t_banner_template b 
+	select count(a.id) from t_banner a ,
+			t_banner_template b 
 		<where>
 				a.banner_template_id = b.id and a.adgroup_id=#{adGroupId}
 				<if test="value !=null">
@@ -83,13 +98,13 @@
 	</select>
 	
 	<select id="countByAdGroupId" parameterType="long" resultType="int">
-	select count(id) from t_banner
-	where adgroup_id = #{adGroupId}
+		select count(id) from t_banner
+		where adgroup_id = #{adGroupId}
 	</select>
 	
 	<select id="findById1" parameterType="long" resultType="com.cloudcross.ssp.model.Banner">
 		select
-		<include refid="base_column_advertiser"/>
+		<include refid="base_column_banner"/>
 		from t_banner
 		<where>
 		adgroup_id = #{adGroupId}
@@ -97,27 +112,28 @@
 	</select>
 	
 	<select id="findByIdAdvertiser" parameterType="long" resultMap="Banner">
-		select a.id as id,a.banner_template_id as bannerTemplateId,a.order_id as orderId,a.campaign_id as campaignId,a.adgroup_id as adGroupId,a.visit_address as visitAddress,
-	a.click_address as clickAddress,a.impression_address as impressionAddress,a.status as status1,a.checked as checked,a.updated as updated, b.id as bannerTemplateId,b.agent_id as agentId,b.advertiser_id as advertiserId,b.name as name,b.path as path,b.path_small as pathSmall,b.type as type,b.width as width,b.height as height,b.status as status,b.updated as updated from t_banner a LEFT JOIN t_banner_template b on a.banner_template_id=b.id   
+		select  <include refid="base_column_banner"/> ,
+		<include refid="base_column_bannertemplate"/>
+		from t_banner a 
+		LEFT JOIN t_banner_template b 
+		on a.banner_template_id=b.id   
 		<where>
 				a.id=#{id}
 		</where>
 	</select>
 	
-	<select id="findByIdOperator" parameterType="int" resultMap="Banner">  
-		select <include refid="base_column_operator"/> ,<include refid="banner_template_base_column"/>
-		from t_banner b inner join t_banner_template bt on b.banner_template_id = bt.id left join t_banner_operator bo
-on b.id=bo.banner_id where b.id=#{id}
-	</select>
+	
 	
 	<select id="findByParams" parameterType="map" resultMap="Banner">  
-		select a.id as id,a.banner_template_id as bannerTemplateId,a.order_id as orderId,a.campaign_id as campaignId,a.adgroup_id as adGroupId,a.visit_address as visitAddress,
-	a.click_address as clickAddress,a.impression_address as impressionAddress,a.status as status1,a.checked as checked,a.updated as updated,a.supdated as supdated,b.id as bannerTemplateId,b.agent_id as agentId,b.advertiser_id as advertiserId,b.agent_id as agentId,b.name as name,b.path as path,b.path_small as pathSmall,b.type as type,b.width as width,b.height as height,b.status as status,b.updated as updated from t_banner a LEFT JOIN t_banner_template b on a.banner_template_id=b.id   
+		select <include refid="base_column_banner"/> ,
+		<include refid="base_column_bannertemplate"/> 
+		from t_banner a 
+		LEFT JOIN t_banner_template b 
+		on a.banner_template_id=b.id   
 		<where>
 				a.adgroup_id=#{adGroupId}
 				<if test="value !=null">
 				and name like #{value}
-				
 				</if>
 		</where>
 		and  a.status != -1
@@ -125,104 +141,6 @@ on b.id=bo.banner_id where b.id=#{id}
 		limit #{pager.offset}, #{pager.limit}
 	</select>
 	
-	<select id="countByZoneSize" parameterType="HashMap" resultType="int">
-		select count(*) from t_banner b inner join t_banner_template bt on b.banner_template_id = bt.id 
-		where bt.status != -1 and checked != 2 and checked !=0
-	   	<if test="zoneList.size()>0">
-			and
-		   	<foreach item="zone" collection="zoneList"
-		   		 open="(" separator="or" close=")" >
-			      bt.width &lt;= #{zone.width} and bt.height &lt;= #{zone.height}
-			</foreach>	
-	</if>
-		<if test="searchKey!=null and searchValue!=null">
-			and bt.name like #{searchValue}
-		</if>
-		<if test="checked!=null">
-			and b.checked like #{checked}
-		</if>
-	</select>
-	
-	<select id="findByZoneSize" parameterType="HashMap" resultMap="Banner">  
-		select <include refid="base_column_operator"/> ,<include refid="banner_template_base_column"/>
-		from t_banner b inner join t_banner_template bt on b.banner_template_id = bt.id
-		where bt.status != -1 and checked != 2 and checked !=0
-		<if test="zoneList.size()>0">
-			and
-		   	<foreach item="zone" collection="zoneList"
-		   		 open="(" separator="or" close=")" >
-			      bt.width &lt;= #{zone.width} and bt.height &lt;= #{zone.height}
-			</foreach>
-		</if>
-	   	<if test="searchKey!=null and searchValue!=null">
-			and bt.name like #{searchValue}
-		</if>
-		<if test="checked!=null">
-			and b.checked like #{checked}
-		</if>
-	    order by  b.id   desc
-	    <if test="pager!=null">
-		limit #{pager.offset}, #{pager.limit}
-		</if>
-	</select>
-
-<resultMap type="com.cloudcross.ssp.model.Banner" id="Banner">
-	<id property="id" column="id"/>
-	  <result property="bannerTemplateId" column="bannerTemplateId"/> 
-	   <result property="status" column="status1"/>   
-	<result property="orderId" column="orderId"/>
-	<result property="campaignId" column="campaignId"/> 
-  	<result property="adGroupId" column="adGroupId"/>   
-    <result property="visitAddress" column="visitAddress"/> 
-    <result property="clickAddress" column="clickAddress"/> 
-    <result property="impressionAddress" column="impressionAddress"/>
-    <result property="checked" column="checked"/>
-    <result property="updated" column="updated"/>
-    <result property="supdated" column="supdated"/>  
-    <association property="bannerTemplate" javaType="com.cloudcross.ssp.model.BannerTemplate" resultMap="bannerTemplate"/>
-</resultMap>  
-<resultMap type="com.cloudcross.ssp.model.BannerTemplate" id="BannerTemplate">  
-   <id property="id" column="bannerTemplateId"/>  
-   <result property="advertiserId" column="advertiserId"/>
-   <result property="agentId" column="agentId"/>  
-   <result property="name" column="name"/>
-    <result property="path" column="path"/> 
-    <result property="pathSmall" column="pathSmall"/>
-   <result property="type" column="type"/>
-   <result property="width" column="width"/> 
-   <result property="height" column="height"/> 
-   <result property="status" column="status"/>   
-   <result property="updated" column="updated"/>     
-</resultMap>  
-
-<!--<resultMap type="com.cloudcross.ssp.model.Banner" id="banneroperator">
-		<id property="id" column="bannerId"/>
-		<result property="bannerTemplateId" column="bannerTemplateId"/> 
-		<result property="orderId" column="orderId"/>
-		<result property="campaignId" column="campaignId"/> 
-	  	<result property="adGroupId" column="adgroupId"/>   
-	    <result property="visitAddress" column="visitAddress"/> 
-	    <result property="clickAddress" column="clickAddress"/> 
-	    <result property="impressionAddress" column="impressionAddress"/> 
-	    <result property="checked" column="checked"/> 
-	    <result property="operatorChecked" column="operatorChecked"/>
-	    <result property="updated" column="updated"/> 
-	    <result property="memo" column="memo"/> 
-	    <association property="bannerTemplate" resultMap="com.cloudcross.ssp.model.BannerTemplate"/>
-	</resultMap>  -->
-	<!--  <resultMap type="com.cloudcross.ssp.model.BannerTemplate" id="bannerTemplate">  
-	   <id property="id" column="banner_templateId"/>  
-	   <result property="advertiserId" column="advertiserId"/> 
-	   <result property="name" column="name"/>
-	    <result property="path" column="path"/> 
-	     <result property="pathSmall" column="pathSmall"/>
-	   <result property="type" column="type"/>
-	   <result property="width" column="width"/> 
-	   <result property="height" column="height"/> 
-	   <result property="status" column="status"/>   
-	   <result property="updated" column="bannerTemplateUpdated"/>     
-	</resultMap>-->
-	
 	<insert id="addBanner" parameterType="com.cloudcross.ssp.model.Banner" useGeneratedKeys="true"
 		keyProperty="id">
 		insert into
@@ -398,6 +316,8 @@ on b.id=bo.banner_id where b.id=#{id}
 	</select>
 	
 	
+	
+	
 	<select id="findByParams2" parameterType="map" resultMap="Banner">  
 		select a.status as status1,a.id as id,a.banner_template_id as bannerTemplateId,a.order_id as orderId,a.campaign_id as campaignId,a.adgroup_id as adGroupId,a.visit_address as visitAddress,
 	a.click_address as clickAddress,a.impression_address as impressionAddress, a.checked as checked,a.updated as updated,b.id as bannerTemplateId,b.agent_id as agentId,b.advertiser_id as advertiserId,b.agent_id as agentId,b.name as name,b.path as path,b.path_small as pathSmall,b.type as type,b.width as width,b.height as height,b.status as status,b.updated as updated from t_banner a LEFT JOIN t_banner_template b on a.banner_template_id=b.id   
@@ -427,6 +347,7 @@ on b.id=bo.banner_id where b.id=#{id}
 					</where>
 		order by a.id   desc
 	</select>
+	
 	<update id="updateOperatorBannerTime" parameterType="HashMap">
 			update t_banner_operator 
 			set supdated = #{supdated}
@@ -439,34 +360,5 @@ on b.id=bo.banner_id where b.id=#{id}
 	</update>
 	
 	
-	<update id="updateOperatorBanner" parameterType="HashMap">
-		update t_banner_operator 
-			set operator_id=#{operatorId},checked = #{operatorChecked},supdated = #{supdated}
-			where banner_id = #{bannerId}
-	</update>
-	<select id="countByOperator" parameterType="HashMap" resultType="int">
-		select count(*) from t_banner b inner join t_banner_template bt on b.banner_template_id = bt.id left join t_banner_operator bo
-on b.id=bo.banner_id and bo.operator_id=#{operatorId}  
-where b.status = 0 and bt.status = 0 and b.checked = 1 
-	   	<if test="zoneList.size()>0">
-			and
-		   	<foreach item="zone" collection="zoneList"
-		   		 open="(" separator="or" close=")" >
-			      bt.width &lt;= #{zone.width} and bt.height &lt;= #{zone.height}
-			</foreach>
-		</if>
-		<if test="searchKey!=null and searchValue!=null">
-			and bt.name like #{searchValue}
-		</if>
-		<if test="operatorChecked!=null">
-		<choose>
-			<when test="operatorChecked == 0">
-				and ISNULL(bo.checked) or bo.checked =0
-			</when>
-			<otherwise>
-				and bo.checked=#{operatorChecked}
-			</otherwise>	
-		</choose>
-		</if>
-	</select>
+	
 </mapper>

src/main/java/com/cloudcross/ssp/service/IBannerService.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.cloudcross.ssp.model.AuditBanner;
 import com.cloudcross.ssp.model.Banner;
 import com.cloudcross.ssp.base.service.IGenericService;
 import com.cloudcross.ssp.common.utils.Pager;
@@ -35,14 +36,14 @@ public interface IBannerService extends IGenericService<Banner> {
 		//定义根据运营商id，搜索框的值，计算素材个数的方法
 	int countByOperatorIdandParams(Long operatorId,Map<String, Object> paramMap);
 	//定义根据运营商id，搜索框的值，和相应的页码 返回素材列表的方法
-	List<Banner> findByOperatorIdandParams(Long operatorId,Map<String, Object> paramMap, Pager pager);
+	List<AuditBanner> findByOperatorIdandParams(Long operatorId,Map<String, Object> paramMap, Pager pager);
 	//新增素材审核
 	boolean addOperatorBanner(Long bannerId,int status,Long operatorId);
 	//更新素材审核
 	boolean updataOperatorBanner(Long bannerId,int status,Long operatorId);
 	
 	//
-	public Banner findByIdOperator(Long id);
+	public AuditBanner findByIdOperator(Long id);
 	public boolean updateStatusOperator(List<Long> bannerIdList, int checked);
 	
 }

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

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.AuditBanner;
 import com.cloudcross.ssp.model.Banner;
 import com.cloudcross.ssp.model.BannerTemplate;
 import com.cloudcross.ssp.model.Log;
@@ -41,10 +42,7 @@ public class BannerService implements IBannerService {
 	public Banner findById(Long id) {
 		return myBatisDao.get("bannerSqlMapper.findByIdAdvertiser", id);
 	}
-	public Banner findByIdOperator(Long id) {
-		// TODO Auto-generated method stub
-		return myBatisDao.get("bannerSqlMapper.findByIdOperator",id);
-	}
+	
 	@Override
 	public int countByParams(Map<String, Object> paramMap) {
 		//这里的搜索只是对名称进行搜索
@@ -136,15 +134,7 @@ public class BannerService implements IBannerService {
 				.map());
 		return true;
 	}
-	public boolean updateStatusOperator(List<Long> bannerIdList, int checked) {
-		// TODO Auto-generated method stub
-		myBatisDao.save("bannerSqlMapper.updateBannerStatusOperator",
-				MapBuilder.create(HashMap.class)
-					.add("bannerIdList", bannerIdList)
-					.add("updated", new Date())
-					.add("checked", checked).map());
-		return true;
-	}
+	
 	@Override
 	public int countByAdGroupId(Long adGroupId) {
 		return myBatisDao.get("bannerSqlMapper.countByAdGroupId", adGroupId);
@@ -299,10 +289,31 @@ public class BannerService implements IBannerService {
 		return true;
 	}
 	
+	
+	
+	
+	/**
+	 * operator调用service
+	 * */
+	
+	public AuditBanner findByIdOperator(Long id) {
+		// TODO Auto-generated method stub
+		return myBatisDao.get("auditBannerSqlMapper.findByIdOperator",id);
+	}
+	
+	public boolean updateStatusOperator(List<Long> bannerIdList, int checked) {
+		// TODO Auto-generated method stub
+		myBatisDao.save("auditBannerSqlMapper.updateBannerStatusOperator",
+				MapBuilder.create(HashMap.class)
+					.add("bannerIdList", bannerIdList)
+					.add("updated", new Date())
+					.add("checked", checked).map());
+		return true;
+	}
 	public int countByOperatorIdandParams(Long operatorId,Map<String, Object> paramMap) {
 		// TODO Auto-generated method stub
 		LOG.info("传入的参数：" + operatorId);
-		List<Zone> zoneList = myBatisDao.getList("zoneSqlMapper.findByOperatorId", operatorId);
+		List<Zone> zoneList = myBatisDao.getList("zoneSqlMapper.findByOperatorIdOperator", operatorId);
 		paramMap.put("zoneList", zoneList);
 		if(zoneList.size()==0){
 			return 0;
@@ -315,28 +326,27 @@ public class BannerService implements IBannerService {
 			paramMap.put("operatorChecked", paramMap.get("operatorChecked"));
 		}
 		System.out.println("bbb:" + paramMap.get("checked"));
-		int bannerNumber = myBatisDao.get("bannerSqlMapper.countByOperator", paramMap);
+		int bannerNumber = myBatisDao.get("auditBannerSqlMapper.countByOperator", paramMap);
 		LOG.info("计算素材的个数：" + bannerNumber);
 		return bannerNumber;
 	}
 	
-	public List<Banner> findByOperatorIdandParams(Long operatorId,Map<String, Object> paramMap, Pager pager) {
+	public List<AuditBanner> findByOperatorIdandParams(Long operatorId,Map<String, Object> paramMap, Pager pager) {
 		// TODO Auto-generated method stub
 		LOG.info("传入的参数：" + operatorId);
-		List<Zone> zoneList = myBatisDao.getList("zoneSqlMapper.findByOperatorId", operatorId);
+		List<Zone> zoneList = myBatisDao.getList("zoneSqlMapper.findByOperatorIdOperator", operatorId);
 		paramMap.put("zoneList", zoneList);
 		paramMap.put("pager", pager);
 		if(zoneList.size()==0){
 			return null;
 		}
 		System.out.println("bbb1:" + paramMap.get("checked"));
-		List<Banner> bannerList = myBatisDao.getList("bannerSqlMapper.findByOpertor", paramMap);
+		List<AuditBanner> bannerList = myBatisDao.getList("auditBannerSqlMapper.findByOpertor", paramMap);
 		LOG.info("素材列表：" + bannerList);
 		return bannerList;
 	}
-	
 	public boolean addOperatorBanner(Long bannerId,int status,Long operatorId) {
-		myBatisDao.save("bannerSqlMapper.addOperatorBanner",
+		myBatisDao.save("auditBannerSqlMapper.addOperatorBanner",
 				MapBuilder.create(HashMap.class)
 					.add("operatorId", operatorId)
 					.add("bannerId",bannerId)
@@ -345,7 +355,7 @@ public class BannerService implements IBannerService {
 		return true;
 	}
 	public boolean updataOperatorBanner(Long bannerId,int status,Long operatorId) {
-		myBatisDao.save("bannerSqlMapper.updateOperatorBanner",
+		myBatisDao.save("auditBannerSqlMapper.updateOperatorBanner",
 				MapBuilder.create(HashMap.class)
 					.add("operatorId", operatorId)
 					.add("bannerId",bannerId)

src/main/java/com/cloudcross/ssp/web/operator/main/BannerAuditController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.AuditBanner;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
@@ -65,7 +66,7 @@ public class BannerAuditController extends SimpleController {
 		pager.setPage(page);
 		pager.setTotalRow(totalRow);
 		//获取创意的列表
-		List<Banner> bannerList = bannerService.findByOperatorIdandParams(operatorId,paramMap,pager);
+		List<AuditBanner> bannerList = bannerService.findByOperatorIdandParams(operatorId,paramMap,pager);
 		model.addAttribute("bannerList", bannerList);
 		model.addAttribute("operatorId", operatorId);
 		model.addAttribute("pager", pager);
@@ -100,7 +101,7 @@ public class BannerAuditController extends SimpleController {
 		pager.setPage(page);
 		pager.setTotalRow(totalRow);
 		//获取创意的列表
-		List<Banner> bannerList = bannerService.findByOperatorIdandParams(
+		List<AuditBanner> bannerList = bannerService.findByOperatorIdandParams(
 				operatorId,paramMap,pager);
 		model.addAttribute("pager", pager);
 		model.addAttribute("bannerList", bannerList);
@@ -120,8 +121,8 @@ public class BannerAuditController extends SimpleController {
 		//将id转为List<Long>类型传入updateStatus函数
 		if (ArrayUtils.isNotEmpty(id)) {
 			for(long i:id){
-			Banner banner = bannerService.findByIdOperator(i);
-				if(banner.getOperatorChecked()==-1){
+			AuditBanner auditBanner = bannerService.findByIdOperator(i);
+				if(auditBanner.getOperatorChecked()==-1){
 					bannerService.addOperatorBanner(i,1,operatorId);
 				}else{
 					bannerService.updataOperatorBanner(i,1,operatorId);
@@ -144,8 +145,8 @@ public class BannerAuditController extends SimpleController {
 		//将id转为List<Long>类型传入updateStatus函数
 		if (ArrayUtils.isNotEmpty(id)) {
 			for(long i:id){
-				Banner banner = bannerService.findByIdOperator(i);
-				if(banner.getOperatorChecked()==-1){
+				AuditBanner auditBanner = bannerService.findByIdOperator(i);
+				if(auditBanner.getOperatorChecked()==-1){
 					bannerService.addOperatorBanner(i,2,operatorId);
 				}else{
 					bannerService.updataOperatorBanner(i,2,operatorId);
@@ -171,10 +172,10 @@ public class BannerAuditController extends SimpleController {
 		//获取创意的列表
 		Long operatorId = getLoginUser().getOperatorId();
 		paramMap.put("operatorId", operatorId);
-		List<Banner> bannerList = bannerService.findByOperatorIdandParams(
+		List<AuditBanner> bannerList = bannerService.findByOperatorIdandParams(
 				operatorId, paramMap, null);
 		paramMap.put("bannerList", bannerList);
-		for(Banner br: bannerList) {
+		for(AuditBanner br: bannerList) {
 			System.out.println("luo:" + br);
 		}
 		response.reset();

src/main/webapp/WEB-INF/pages/operator/main/banner-audit/list.ftl

@@ -14,28 +14,28 @@
     </thead>
     <tbody>
 		<#if bannerList ??>
-        <#list bannerList as banner>
+        <#list bannerList as auditBanner>
         <tr class="">
             <td class="center">
-				<label><input  autocomplete="off"   type="checkbox" name="id" value="${banner.id!}"><span class="lbl"></span></label>
+				<label><input  autocomplete="off"   type="checkbox" name="id" value="${auditBanner.id!}"><span class="lbl"></span></label>
 			</td>
-            <td >${banner.id!}</td>
-            <td><img src="${banner.bannerTemplate.pathSmall!}"></td>
-            <td >${banner.bannerTemplate.name!}</td>
-            <td>${banner.visitAddress!}</td>
-            <td>${banner.bannerTemplate.width!}x${banner.bannerTemplate.height!}</td>
-            <td><#if banner.operatorChecked==-1||banner.operatorChecked==0>未审核<#else>已审核</#if></td>
-            <td>${banner.updated?datetime}</td>
+            <td >${auditBanner.id!}</td>
+            <td><img src="${auditBanner.bannerTemplate.pathSmall!}"></td>
+            <td >${auditBanner.bannerTemplate.name!}</td>
+            <td>${auditBanner.visitAddress!}</td>
+            <td>${auditBanner.bannerTemplate.width!}x${auditBanner.bannerTemplate.height!}</td>
+            <td><#if auditBanner.operatorChecked==-1||auditBanner.operatorChecked==0>未审核<#else>已审核</#if></td>
+            <td>${auditBanner.updated?datetime}</td>
             <td>
-            	<#if banner.operatorChecked==1>
+            	<#if auditBanner.operatorChecked==1>
             	<button class="labeled" href="#">审核通过</button>
             	<#else>
-            	<button class="unlabeled" href="${ctx}/operator/main/banner-audit/pass?id=#{banner.id}">审核通过</button>
+            	<button class="unlabeled" href="${ctx}/operator/main/banner-audit/pass?id=#{auditBanner.id}">审核通过</button>
             	</#if>
-            	<#if banner.operatorChecked==2>
+            	<#if auditBanner.operatorChecked==2>
                 <button class="labeled" href="#">审核不通过</button>
                 <#else>
-                <button class="unlabeled" href="${ctx}/operator/main/banner-audit/reject?id=#{banner.id}">审核不通过</button>
+                <button class="unlabeled" href="${ctx}/operator/main/banner-audit/reject?id=#{auditBanner.id}">审核不通过</button>
                 </#if>
             </td>
         </tr>