素材审核导出excel

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

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

@@ -36,12 +36,8 @@
 		<where>
 		b.status != -1
 				and a.banner_template_id = b.id 
-				<if test="key!=null and value!=null">
-					<choose>
-						<when test="key=='name'">
-							and b.name like #{value}
-						</when>
-					</choose>
+				<if test="searchValue!=null">
+					and b.name like #{value}
 				</if>
 				<if test="checked !=null">
 					and a.checked like #{checked}
@@ -60,12 +56,8 @@
 	left join t_industry e on d.industry_id = e.id
 	<where>
 	b.status != -1
-			<if test="key!=null and value!=null">
-					<choose>
-						<when test="key=='name'">
-							and b.name like #{value}
-						</when>
-					</choose>
+			<if test="searchValue!=null">
+				and b.name like #{value}
 			</if>
 			<if test="checked !=null">
 				and a.checked like #{checked}
@@ -86,12 +78,8 @@
 	left join t_industry e on d.industry_id = e.id
 	<where>
 	b.status != -1
-			<if test="key!=null and value!=null">
-					<choose>
-						<when test="key=='name'">
-							and b.name like #{value}
-						</when>
-					</choose>
+			<if test="searchValue!=null">
+				and b.name like #{value}
 			</if>
 			<if test="checked !=null">
 				and a.checked like #{checked}

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

@@ -32,12 +32,8 @@
 		from t_adv_agent,t_industry,t_advertiser 
 		where t_adv_agent.id=t_advertiser.agent_id 
 		
-		 <if test="key!=null and value!=null">
-			<choose>
-				<when test="key=='name'">
-					and t_advertiser.name like #{value}
-				</when>
-			</choose>	
+		 <if test="searchValue!=null">
+			and t_advertiser.name like #{value}
 		</if>
 		 <if test="checkStatus!=null">	
 			and t_advertiser.check_status = #{checkStatus}
@@ -86,12 +82,8 @@
 		from t_advertiser a,t_adv_agent b 
 		where b.id=a.agent_id 
 		and a.status != -1
-		<if test="key!=null and value!=null">
-			<choose>
-				<when test="key=='name'">
-					and a.name like #{value}
-				</when>
-			</choose>	
+		<if test="searchValue!=null">
+			and a.name like #{value}
 		</if>
 		 <if test="checkStatus!=null">	
 			and a.check_status = #{checkStatus}
@@ -233,12 +225,8 @@ from t_advertiser a,t_adv_agent b
 		from t_adv_agent,t_industry,t_advertiser 
 		where t_adv_agent.id=t_advertiser.agent_id 
 		
-		 <if test="key!=null and value!=null">
-			<choose>
-				<when test="key=='name'">
-					and t_advertiser.name like #{value}
-				</when>
-			</choose>	
+		 <if test="searchValue!=null">
+			and t_advertiser.name like #{value}
 		</if>
 		 <if test="checkStatus!=null">	
 			and t_advertiser.check_status = #{checkStatus}

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

@@ -78,7 +78,7 @@
 		<where>
 				a.dsp_id = b.id
 			<if test="searchValue !=null">
-				and b.name like #{searchValue}
+				and b.name like #{value}
 			</if>
 			<if test="backState !=null">
 				and a.state = #{backState}
@@ -92,7 +92,7 @@
 		<where>
 		a.dsp_id = b.id
 		<if test="searchValue !=null">
-			and b.name like #{searchValue}
+			and b.name like #{value}
 		</if>
 		<if test="backState !=null">
 			and a.state = #{backState}

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

@@ -35,12 +35,15 @@ public class AuditBannerService implements IAuditBannerService {
 
 	@Override
 	public int countByParams(Map<String, Object> paramMap) {
-		// TODO Auto-generated method stub
-		String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
-		String checked = SqlHelper.doLike(paramMap.get("checked"));
-		paramMap.put("checked", checked);
-	    paramMap.put("key", paramMap.get("searchKey"));
-		paramMap.put("value", searchValue);
+		if(paramMap.get("searchValue")==null || paramMap.get("searchValue")==""){
+			paramMap.put("searchValue", null);
+		}else{
+			String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
+			paramMap.put("value", searchValue);
+		}
+		if(paramMap.get("checked")==null || paramMap.get("checked")==""){
+			paramMap.put("checked",null);
+		}
 		LOG.info("paramMap的值为"+paramMap);
 		
 		return myBatisDao.get("auditBannerSqlMapper.countByParams", paramMap);
@@ -49,9 +52,7 @@ public class AuditBannerService implements IAuditBannerService {
 
 	@Override
 	public List<AuditBanner> findByParams(Map<String, Object> paramMap, Pager pager) {
-		String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
-		paramMap.put("key", paramMap.get("searchKey"));
-		paramMap.put("value", searchValue);
+		
 		paramMap.put("pager", pager);
 		LOG.info("paramMap的值为"+paramMap);
 		return myBatisDao.getList("auditBannerSqlMapper.findByParams", paramMap);
@@ -134,11 +135,15 @@ public class AuditBannerService implements IAuditBannerService {
 
 	@Override
 	public List<AuditBanner> findAudit(Map<String, Object> paramMap) {
-		String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
-		String checked = SqlHelper.doLike(paramMap.get("checked"));
-		paramMap.put("key", paramMap.get("searchKey"));
-		paramMap.put("value", searchValue);
-		paramMap.put("checked", checked);
+		if(paramMap.get("searchValue")==null || paramMap.get("searchValue")==""){
+			paramMap.put("searchValue", null);
+		}else{
+			String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
+			paramMap.put("value", searchValue);
+		}
+		if(paramMap.get("checked")==null || paramMap.get("checked")==""){
+			paramMap.put("checked",null);
+		}
 		return myBatisDao.getList("auditBannerSqlMapper.findAudit", paramMap);
 
 	}

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

@@ -31,9 +31,12 @@ public class AuditService implements IAuditService{
 
 	@Override
 	public int countByParams(Map<String, Object> paramMap) {
+		if(paramMap.get("searchValue")==null || paramMap.get("searchValue")==""){
+			paramMap.put("searchValue", null);
+		}else{
 		String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
-		paramMap.put("key", paramMap.get("searchKey"));
 		paramMap.put("value", searchValue);
+		}
 		return myBatisDao.get("auditSqlMapper.countByParamsBack", paramMap);
 	}
 
@@ -41,8 +44,6 @@ public class AuditService implements IAuditService{
 	public List<Audit> findByParams(Map<String, Object> paramMap, Pager pager) {
 		// TODO Auto-generated method stub
 		String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
-		paramMap.put("key", paramMap.get("searchKey"));
-		paramMap.put("value", searchValue);
 		paramMap.put("pager", pager);
 		return myBatisDao.getList("auditSqlMapper.selectByParamsBack", paramMap);
 	}
@@ -109,6 +110,12 @@ public class AuditService implements IAuditService{
 	}
 	@Override
 	public List<Audit> findDeliverEffectAnalysis(Map<String, Object> paramMap) {
+		if(paramMap.get("searchValue")==null || paramMap.get("searchValue")==""){
+			paramMap.put("searchValue", null);
+		}else{
+		String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
+		paramMap.put("value", searchValue);
+		}
 		return myBatisDao.getList("auditSqlMapper.findDeliverEffectAnalysis", paramMap);
 	}
 

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

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import com.cloudcross.ssp.base.dao.GenericIBatisDao;
 import com.cloudcross.ssp.common.utils.MapBuilder;
 import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.common.utils.SqlHelper;
 import com.cloudcross.ssp.model.DspBanner;
 import com.cloudcross.ssp.model.Zone;
 import com.cloudcross.ssp.service.IDspBannerService;
@@ -111,6 +112,9 @@ public class DspBannerService implements IDspBannerService{
 		if(!paramMap.containsKey("searchValue")||paramMap.get("searchValue").equals("")){
 			paramMap.put("searchValue", null);
 				
+		}else{
+			String value = SqlHelper.doLike(paramMap.get("searchValue"));
+			paramMap.put("value",value);
 		}
 		if(!paramMap.containsKey("backState")||paramMap.get("backState").equals("")){
 			paramMap.put("backState", null);
@@ -122,6 +126,7 @@ public class DspBannerService implements IDspBannerService{
 	@Override
 	public List<Map<String, Object>> findByParams(
 			HashMap<String, Object> paramMap,Pager pager) {
+	
 			paramMap.put("pager", pager);
 		return myBatisDao.getList("dspBannerSqlMapper.findByParams", paramMap);
 	}
@@ -156,7 +161,16 @@ public class DspBannerService implements IDspBannerService{
 
 	@Override
 	public List<Map<String, Object>> findByParamMap(Map<String, Object> paramMap) {
-		
+		if(!paramMap.containsKey("searchValue")||paramMap.get("searchValue").equals("")){
+			paramMap.put("searchValue", null);
+				
+		}else{
+			String value = SqlHelper.doLike(paramMap.get("searchValue"));
+			paramMap.put("value",value);
+		}
+		if(!paramMap.containsKey("backState")||paramMap.get("backState").equals("")){
+			paramMap.put("backState", null);
+		}
 		return myBatisDao.getList("dspBannerSqlMapper.findByParamMap", paramMap);
 	}
 

src/main/java/com/cloudcross/ssp/web/back/main/audit/AuditBannerController.java

@@ -103,10 +103,9 @@ public @ResponseBody String disable(@RequestParam Long[] id,String memo) {
 
 @RequestMapping("/auditBannerExcel")
 public void auditBannerExcel
-(HttpServletRequest request,
-		HttpServletResponse response,
+(HttpServletResponse response,
 		@RequestParam Map<String, Object> paramMap) {
-	
+	int totalRow = iabs.countByParams(paramMap);
 	List<AuditBanner> auditBannerList = iabs.findAudit(paramMap);
 	paramMap.put("auditBannerList", auditBannerList);
 	response.reset();

src/main/java/com/cloudcross/ssp/web/back/main/audit/AuditController.java

@@ -39,24 +39,6 @@ public class AuditController extends SimpleController{
 	/**
 	 * @return 返回到广告主资质审核第一页。
 	 */
-//	@RequestMapping
-//	public String index(Model model,
-//			@RequestParam HashMap<String, Object> paramMap,
-//			@RequestParam(defaultValue="1") int page) {	
-//		int totalRow = auditService.countByParams(paramMap);
-//		Pager pager = new Pager();
-//		pager.setPage(page);
-//		System.out.println("luo0:" + paramMap);
-//		pager.setTotalRow(totalRow);
-//		List<Audit> auditList = auditService.findByParams(paramMap, pager);
-//		
-//		System.out.println(auditList.toString());
-//		model.addAllAttributes(paramMap);
-//		model.addAttribute("pager", pager);
-//		model.addAttribute("auditList", auditList);
-//		return page("index");
-//	}
-//	
 	@RequestMapping("/list")
 	public String list(Model model,
 			@RequestParam HashMap<String, Object> paramMap,

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

@@ -48,7 +48,7 @@
     </tbody>
 </table>
 <div id="exportReport">
-	<a id="exportExcel" class="btn_export" href="${ctx}/back/main/audit/audit-banner/auditBannerExcel">导出Excel</a>
+	<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_bannerAudit()">导出Excel</a>
 </div>
 <div id="pageDiv">
 	<#include "/common/pagination/simple.ftl"/>

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

@@ -79,7 +79,7 @@
 				    </tbody>
 				</table>
 				<div id="exportReport">
-					<a id="exportExcel" class="btn_export" href="${ctx}/back/main/audit/audit/exportDataReportExcel">导出Excel</a>
+					<a id="exportExcel" class="btn_export" href="jjavascript:void(0);" onclick="exportExcel_audit()">导出Excel</a>
 				</div>
 				<div id="pageDiv">
 					<#include "/common/pagination/simple.ftl"/>

src/main/webapp/WEB-INF/pages/back/main/dsp/audit/list.ftl

@@ -90,7 +90,7 @@
 				    </tbody>
 				</table>
 				<div id="exportReport">
-					<a id="exportExcel" class="btn_export" href="${ctx}/back/main/dsp/audit/auditBackDspExcel">导出Excel</a>
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_dspAudit()">导出Excel</a>
 				</div>
 				<div id="pageDiv">
 					<#include "/common/pagination/simple.ftl"/>

src/main/webapp/assets/js/back/auditBanner.js

@@ -96,4 +96,24 @@ function batchAuditOper(obj,url,type){
             }
         });
 	}
+}
+
+function exportExcel_audit(){
+	var searchValue = $("#searchValue").val();
+	if(searchValue == "请输入关键字"){
+		searchValue = "";
+	}
+	var param = "?checked="+$("#status").val()+"&searchValue="+searchValue;
+	$("#exportExcel").attr("href",$("#ctx").val()+"/back/main/audit/audit/exportDataReportExcel"+param);
+	return false;
+}
+
+function exportExcel_bannerAudit(){
+	var searchValue = $("#searchValue").val();
+	if(searchValue == "请输入关键字"){
+		searchValue = "";
+	}
+	var param = "?checked="+$("#status").val()+"&searchValue="+searchValue;
+	$("#exportExcel").attr("href",$("#ctx").val()+"/back/main/audit/audit-banner/auditBannerExcel"+param);
+	return false;
 }

src/main/webapp/assets/js/back/auditDsp.js

@@ -13,6 +13,7 @@ $(document).ready(function(){
  			$(this).addClass("selectBar_change").siblings('.selectBar_change').removeClass('selectBar_change');
  		}
  	});
+ 	
  	$("#selectBar_statusOther a").click(function(){
  		$("#status").val($(this).attr("value"));
  		refreshData();
@@ -43,5 +44,16 @@ $(document).ready(function(){
 		}
 		batchPassOrUnpassOper($(this),url,type);
 	});
-	
+
 });
+
+function exportExcel_dspAudit(){
+	var searchValue = $("#searchValue").val();
+	if(searchValue == "请输入关键字"){
+		searchValue = "";
+	}
+	var param = "?backState="+$("#status").val()+"&searchValue="+searchValue;
+	$("#exportExcel").attr("href",$("#ctx").val()+"/back/main/dsp/audit/auditBackDspExcel"+param);
+	return false;
+}
+