显示端

src/main/java/com/ctrip/fun/admin/controller/basic/BuyVoucherActivityController.java

@@ -57,7 +57,8 @@ public class BuyVoucherActivityController {
             }
         }
         query.setPagerOffset(currentPage * query.getPagerPerPage());
-
+        // 无法迭代app  区分app 和管理后台
+        query.setShowPaths(0);
         PagedResponseBean<BuyVoucherActivityBean> response = buyVoucherActivityService.queryList(query);
         pageSize = query.getPagerPerPage();
         total = response.getCount();

src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/form.ftl

@@ -255,14 +255,14 @@
 			                <input style="margin-bottom: 5px;" type="radio"  name="showPaths" value="2" <#if dto.showPaths == 2>checked</#if>>
 			                <span style="padding-right: 20px;">小程序</span>	
 			                <input style="margin-bottom: 5px;" type="radio"  name="showPaths" value="3" <#if dto.showPaths == 3>checked</#if>>
-			                <span style="padding-right: 20px;">全部</span>			            						
+			                <span style="padding-right: 20px;">两端</span>			            						
 						<#else>
 			                <input style="margin-bottom: 5px;" type="radio"  name="showPaths" value="1" checked>
 			                <span style="padding-right: 20px;">App</span>
 			                <input style="margin-bottom: 5px;" type="radio"  name="showPaths" value="2" >
 			                <span style="padding-right: 20px;">小程序</span>	
 			                <input style="margin-bottom: 5px;" type="radio"  name="showPaths" value="3" >
-			                <span style="padding-right: 20px;">全部</span>			               
+			                <span style="padding-right: 20px;">两端</span>			               
 						</#if>
 				    </div>
 				</div>

src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/list.ftl

@@ -14,8 +14,7 @@
 <@com.layout title="查询现金券规则" module="marketing" current="buyVoucherActivity_list" pageCss=pageCssContent pageJs=pageJsContent>
 <form class="form-inline search-box widthShow" action="" method="get" autocomplete="off" >
 	<@com.textInput "dto.id" "style=\"margin-left: 5px;\"" "活动ID"/>
-	<@com.textInput "dto.activityName" "style=\"margin-left: 5px;\"" "活动名称"/>
-	<@com.singleSelectQuery "dto.showPaths" enums["com.ctrip.fun.common.vo.basic.VoucherShowPathsCodeEnum"] "" "显示途径"/>
+	<@com.textInput "dto.activityName" "style=\"margin-left: 5px;\"" "活动名称"/>	
 	<@com.singleSelectQuery "dto.regionCode" enums["com.ctrip.fun.common.vo.basic.VoucherRegionCodeEnum"] "" "区域类型"/>
 	<@com.singleSelectQuery "dto.voucherType" enums["com.ctrip.fun.common.vo.basic.VoucherTypeCodeEnum"] "" "卷类型"/>  
     <@com.textInputTwoDate "dto.createdTimeStart" "dto.createdTimeEnd" "style=\"margin-left: 5px;\"" "创建时间"/>
@@ -76,20 +75,7 @@
 			        <#break>
 			  <#default>  
 			       	 未知
-			</#switch>
-			<#switch item.showPaths>
-			  <#case 1>  
-			        <td>App</td>
-			       	<#break>
-			  <#case 2>  
-			        <td>小程序</td>
-			        <#break>
-			  <#case 3>  
-			        <td>全部</td>
-			        <#break>      
-			  <#default>  
-			       	 未知
-			</#switch>
+			</#switch>			
 			<#switch item.voucherType>
 			  <#case 1>  
 			        <td>正常卷</td>

src/main/webapp/WEB-INF/templates/basic/buyVoucherActivity/view.ftl

@@ -209,7 +209,7 @@
 					<input style="margin-bottom: 5px;" type="radio"  name="showPaths" value="2">
 					<span style="padding-right: 20px;">小程序</span>
 					<input style="margin-bottom: 5px;" type="radio"  name="showPaths" value="3">
-					<span style="padding-right: 20px;">全部</span>
+					<span style="padding-right: 20px;">两端</span>
 				</div>
 			</div>