jun.zhou 9 years ago
parent
commit
46d7760d16

+ 1 - 1
src/main/java/com/cloudcross/ssp/model/mapper/place-operator.sql.xml

@@ -157,7 +157,7 @@
 	</select>
 	</select>
 	
 	
 	<select id="queryOperatorPlace" parameterType="java.util.Map" resultType="com.cloudcross.ssp.model.PlaceOperator">
 	<select id="queryOperatorPlace" parameterType="java.util.Map" resultType="com.cloudcross.ssp.model.PlaceOperator">
-		select tpo.id id,tpo.name name,tor.company_name operatorName,tpo.place_id placeId  from t_place_operator tpo,t_operator tor where tpo.operator_id = tor.id and tor.status != -1 limit #{pager.offset}, #{pager.limit} 
+		select tpo.id id,tpo.name name,tor.company_name operatorName,tpo.place_id placeId  from t_place_operator tpo,t_operator tor where tpo.operator_id = tor.id and tor.status != -1 order by tpo.id limit #{pager.offset}, #{pager.limit} 
 	</select>
 	</select>
 	
 	
 	<select id="queryOperatorPlaceCount" resultType="java.lang.Integer">
 	<select id="queryOperatorPlaceCount" resultType="java.lang.Integer">

+ 2 - 2
src/main/java/com/cloudcross/ssp/model/mapper/place.sql.xml

@@ -63,8 +63,8 @@
 		select tp.name name from t_place tp,t_place_class tpc where tp.id = tpc.place_id and tpc.class_id = #{classId}
 		select tp.name name from t_place tp,t_place_class tpc where tp.id = tpc.place_id and tpc.class_id = #{classId}
 	</select>
 	</select>
 	
 	
-	<select id="queryPlace" resultType="com.cloudcross.ssp.model.Place">
-		select id,name from t_place
+	<select id="queryPlace" parameterType="java.util.Map" resultType="com.cloudcross.ssp.model.Place">
+		select id,name from t_place order by id limit #{pager.offset}, #{pager.limit}
 	</select>
 	</select>
 	
 	
 	<select id="queryPlaceCount" resultType="java.lang.Integer">
 	<select id="queryPlaceCount" resultType="java.lang.Integer">

+ 2 - 2
src/main/java/com/cloudcross/ssp/model/mapper/placeclass-information.sql.xml

@@ -26,8 +26,8 @@
 		select DISTINCT(class_id) classId from t_place_class where place_id in (select place_id from t_adgroup_place where adgroup_id = #{adgroupId})
 		select DISTINCT(class_id) classId from t_place_class where place_id in (select place_id from t_adgroup_place where adgroup_id = #{adgroupId})
 	</select>
 	</select>
 	
 	
-	<select id="queryPlaceClass" resultType="com.cloudcross.ssp.model.PlaceClassInformation">
-		select id,name from t_place_class_info
+	<select id="queryPlaceClass" parameterType="java.util.Map" resultType="com.cloudcross.ssp.model.PlaceClassInformation">
+		select id,name from t_place_class_info order by id limit #{pager.offset}, #{pager.limit}
 	</select>
 	</select>
 	
 	
 	<select id="queryPlaceClassCount" resultType="java.lang.Integer">
 	<select id="queryPlaceClassCount" resultType="java.lang.Integer">

+ 5 - 10
src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/target/AdGroupAlloperatorController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
 import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.common.utils.Pager1;
 import com.cloudcross.ssp.model.Account;
 import com.cloudcross.ssp.model.Account;
 import com.cloudcross.ssp.model.Location;
 import com.cloudcross.ssp.model.Location;
 import com.cloudcross.ssp.model.Operator;
 import com.cloudcross.ssp.model.Operator;
@@ -67,19 +68,13 @@ public class AdGroupAlloperatorController extends SimpleController{
 		List<Integer> positionList = new ArrayList<Integer>();
 		List<Integer> positionList = new ArrayList<Integer>();
 		positionList.add(1);
 		positionList.add(1);
 		condition.put("positionList", positionList);
 		condition.put("positionList", positionList);
-		//List<Zone> zoneList = zoneService.queryZoneByCondition(condition);//获取广告位
 		CampaignPojo campaign = campaignService.findCampaignById(campaignId);
 		CampaignPojo campaign = campaignService.findCampaignById(campaignId);
-		//找到所有的场景,并且显示出来
-		//List<PlaceClassInformation> placeList = placeClassInformationService.findAll();
-		
 		
 		
 		model.addAttribute("campaignId", campaignId);
 		model.addAttribute("campaignId", campaignId);
 		model.addAttribute("advertiserId", campaign.getAdvertiserId());	
 		model.addAttribute("advertiserId", campaign.getAdvertiserId());	
 		model.addAttribute("orderId", campaign.getOrderId());
 		model.addAttribute("orderId", campaign.getOrderId());
 		model.addAttribute("agentId", campaign.getAgentId());
 		model.addAttribute("agentId", campaign.getAgentId());
 		model.addAttribute("budget", campaign.getTotalBudget());
 		model.addAttribute("budget", campaign.getTotalBudget());
-		//model.addAttribute("placeList",placeList);
-		//model.addAttribute("zoneList",zoneList);
 		return page("create");
 		return page("create");
 	}
 	}
 	
 	
@@ -114,7 +109,7 @@ public class AdGroupAlloperatorController extends SimpleController{
 	@RequestMapping("chooseOperator")
 	@RequestMapping("chooseOperator")
 	public String chooseOperatorWindow(Model model,@RequestParam(defaultValue = "1") int page){
 	public String chooseOperatorWindow(Model model,@RequestParam(defaultValue = "1") int page){
 		Integer count = this.operatorService.queryAllOperatorCount();
 		Integer count = this.operatorService.queryAllOperatorCount();
-		Pager pager = new Pager();
+		Pager1 pager = new Pager1();
 		pager.setPage(page);
 		pager.setPage(page);
 		pager.setTotalRow(count);
 		pager.setTotalRow(count);
 		
 		
@@ -137,7 +132,7 @@ public class AdGroupAlloperatorController extends SimpleController{
 	@RequestMapping("chooseOperatorPlace")
 	@RequestMapping("chooseOperatorPlace")
 	public String chooseOperatorPlaceWindow(Model model,@RequestParam(defaultValue = "1") int page){
 	public String chooseOperatorPlaceWindow(Model model,@RequestParam(defaultValue = "1") int page){
 		Integer count = this.placeOperatorService.queryOperatorPlaceCount();
 		Integer count = this.placeOperatorService.queryOperatorPlaceCount();
-		Pager pager = new Pager();
+		Pager1 pager = new Pager1();
 		pager.setPage(page);
 		pager.setPage(page);
 		pager.setTotalRow(count);
 		pager.setTotalRow(count);
 		
 		
@@ -160,7 +155,7 @@ public class AdGroupAlloperatorController extends SimpleController{
 	@RequestMapping("choosePlaceClass")
 	@RequestMapping("choosePlaceClass")
 	public String choosePlaceClassWindow(Model model,@RequestParam(defaultValue = "1") int page){
 	public String choosePlaceClassWindow(Model model,@RequestParam(defaultValue = "1") int page){
 		Integer count = this.placeClassInformationService.queryPlaceClassCount();
 		Integer count = this.placeClassInformationService.queryPlaceClassCount();
-		Pager pager = new Pager();
+		Pager1 pager = new Pager1();
 		pager.setPage(page);
 		pager.setPage(page);
 		pager.setTotalRow(count);
 		pager.setTotalRow(count);
 		
 		
@@ -181,7 +176,7 @@ public class AdGroupAlloperatorController extends SimpleController{
 	@RequestMapping("choosePlace")
 	@RequestMapping("choosePlace")
 	public String choosePlaceWindow(Model model,@RequestParam(defaultValue = "1") int page){
 	public String choosePlaceWindow(Model model,@RequestParam(defaultValue = "1") int page){
 		Integer count = this.placeService.queryPlaceCount();
 		Integer count = this.placeService.queryPlaceCount();
-		Pager pager = new Pager();
+		Pager1 pager = new Pager1();
 		pager.setPage(page);
 		pager.setPage(page);
 		pager.setTotalRow(count);
 		pager.setTotalRow(count);