媒体自投

src/main/java/com/cloudcross/ssp/model/mapper/ad-group.sql.xml

@@ -501,7 +501,7 @@
 				and ta.campaign_id = #{campaignId}
 			</if>
 			<if test="adGroupName != null">
-				and name like #{adGroupName}
+				and ta.name like #{adGroupName}
 			</if>
 			<choose>
 				<when test="selectedStatus == 1">
@@ -514,7 +514,7 @@
 					and now()>ta.expire_time
 				</when>
 				<when test="selectedStatus == 4">
-					and t_adgroup.status=1
+					and ta.status=1
 				</when>
 			</choose>
 		group by ta.id order by ta.id desc
@@ -522,21 +522,21 @@
 	</select>
 	
 	<select id="queryCampaignCountByCondition" parameterType="java.util.Map" resultType="java.lang.Integer">
-		SELECT count(ta.id) WHERE ta.status!=-1
+		SELECT count(ta.id) from t_adgroup ta WHERE ta.status!=-1
 			<if test="agentId != null">
 				and ta.agent_id = #{agentId}
 			</if>
-			<if test="advertiserId == null">
+			<if test="advertiserId != null">
 				and ta.advertiser_id = #{advertiserId}
 			</if>
-			<if test="orderId == null">
+			<if test="orderId != null">
 				and ta.order_id = #{orderId}
 			</if>
-			<if test="campaignId == null">
+			<if test="campaignId != null">
 				and ta.campaign_id = #{campaignId}
 			</if>
 			<if test="adGroupName != null">
-				and name like #{adGroupName}
+				and ta.name like #{adGroupName}
 			</if>
 			<choose>
 				<when test="selectedStatus == 1">
@@ -549,7 +549,7 @@
 					and now()>ta.expire_time
 				</when>
 				<when test="selectedStatus == 4">
-					and t_adgroup.status=1
+					and ta.status=1
 				</when>
 			</choose>
 	</select>

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

@@ -562,7 +562,7 @@ public void commonSaveDriect(Map<String,Object> targetParamsMap,Map<String,Objec
 		@Override
 		public List<AdGroup> queryAdGroupByCondition(Map<String, Object> paramMap, Pager pager) {
 			paramMap.put("pager", pager);
-			return myBatisDao.get("adGroupSqlMapper.queryCampaignByCondition", paramMap);
+			return myBatisDao.getList("adGroupSqlMapper.queryCampaignByCondition", paramMap);
 		}
 
 		@Override

src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/target/OperatorAdGroupController.java

@@ -109,9 +109,13 @@ public class OperatorAdGroupController extends SimpleController{
 	public String list(Model model,@RequestParam HashMap<String, Object> paramMap,@RequestParam(defaultValue = "0") int selectedStatus,@RequestParam(defaultValue = "1") int page) {
 		Map<String,Object>condition =  new HashMap<String,Object>();
 		//处理前台传过来的状态信息系
-		condition.put("selectedStatus", selectedStatus);
+		if(selectedStatus>0){
+			condition.put("selectedStatus", selectedStatus);
+		}
+		
 		//无论是广告主还是代理商，都会有代理商ID传过来
 		condition.put("agentId", getLoginUser().getAgentId());
+		
 		//处理前台传过来的广告主，订单，活动信息（ID，name）
 		Long campaignId = -1L;
 		String selectedcampaignName = "";
@@ -120,7 +124,7 @@ public class OperatorAdGroupController extends SimpleController{
 			selectedcampaignName = "全部活动";
 		}else{
 			campaignId = Long.parseLong(String.valueOf(campaignIdObj));
-			selectedcampaignName = String.valueOf(paramMap.get("selectedcampaignName"));
+			selectedcampaignName = campaignService.findById(campaignId).getName();
 			condition.put("campaignId", campaignId);
 		}
 		model.addAttribute("campaignId", campaignId);
@@ -133,7 +137,7 @@ public class OperatorAdGroupController extends SimpleController{
 			selectedorderName = "全部订单";
 		}else{
 			orderId = Long.parseLong(String.valueOf(orderIdObj));
-			selectedorderName = String.valueOf(paramMap.get("selectedorderName"));
+			selectedorderName = orderService.selectOrderNameById(orderId);
 			condition.put("orderId", orderId);
 		}
 		model.addAttribute("orderId", orderId);
@@ -146,7 +150,7 @@ public class OperatorAdGroupController extends SimpleController{
 			selectedadvertiserName = "全部广告主";
 		}else{
 			advertiserId = Long.parseLong(String.valueOf(advertiserIdObj));
-			selectedadvertiserName = String.valueOf(paramMap.get("selectedadvertiserName"));
+			selectedadvertiserName = advertiserService.selectAdvertiserNameById(advertiserId);
 			condition.put("advertiserId", advertiserId);
 		}
 		model.addAttribute("advertiserId", advertiserId);
@@ -160,7 +164,9 @@ public class OperatorAdGroupController extends SimpleController{
 				e.printStackTrace();
 			}
 		}
-		condition.put("adGroupName", SqlHelper.doLike(adGroupName));
+		if(adGroupName != null && !"".equals(adGroupName)){
+			condition.put("adGroupName", SqlHelper.doLike(adGroupName));
+		}
 		
 		Integer totalRow = this.adGroupService.queryAdGroupCountByCondition(condition);
 		Pager pager = new Pager();
@@ -198,7 +204,7 @@ public class OperatorAdGroupController extends SimpleController{
 		model.addAttribute("budget", campaign.getOrderBudget());
 		model.addAttribute("placeList",placeList);
 		model.addAttribute("zoneList",zoneList);
-		return page("createbyoperator");
+		return page("create");
 	}
 	
 	/**
@@ -234,6 +240,11 @@ public class OperatorAdGroupController extends SimpleController{
 		return this.placeService.findAll();
 	}
 	 
+	
+	public String editWithOperator(){
+		
+		return page("edit");
+	}
 	/**
 	 * 媒体自投保存
 	 * @param request

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/operator-ad-group/list.ftl

@@ -65,8 +65,7 @@
 			    </div>
 			    <div id="navButtons">
 					<div id="button">					
-						<a href="${ctx}/advertiser/main/ad/target/ad-group/create?campaignId=${campaignId!}" class="btn2" id="btn-create">创建投放</a>
-						<a href="${ctx}/advertiser/main/ad/target/ad-group/createbyoperator?campaignId=${campaignId!}" class="btn2" id="btn-sinceVote">媒体自投</a>
+						<a href="${ctx}/advertiser/main/ad/target/operator-ad-group/create?campaignId=${campaignId!}" class="btn2" id="btn-create">创建投放</a>
 						<a class="btn2" id="all-btn-enable">批量开启</a>
 						<a class="btn2" id="all-btn-disable">批量停用</a>
 						<a class="btn2" id="all-btn-delete">批量删除</a>
@@ -103,7 +102,7 @@
 								<td class="tbodyTd"><#if adGroup.status==0>正常<#else>停用</#if></td>
 								<td class="tbodyTd">
 									<div id="listButtons">
-										<a href="${ctx}/advertiser/main/ad/target/ad-group/edit?id=${adGroup.id!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="btn3">编辑</a>
+										<a href="${ctx}/advertiser/main/ad/target/operator-ad-group/edit?id=${adGroup.id!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="btn3">编辑</a>
 										<a href="${ctx}/advertiser/main/ad/report/advertiser-report?selectedadvertiserId=${advertiserId!}&selectedorderId=${orderId!}&selectedcampaignId=${campaignId!}&selectedadGroupId=${adGroup.id!}" class="btn3">查看报表</a>
 										<#if adGroup.status==0>
 										<a id="btn-disable" value="${adGroup.id!}" class="btn3">停用</a>