修复赛事券编辑问题

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

@@ -355,6 +355,44 @@ function getResourceList(page){
         </tr>
         </tr>
         </#if>
         </#if>
         
         
+        <#if dto.voucherType == 2 && dto.multiple==0 && dto.courseRuleConditionBean.type != 1 >
+        <tr>
+	        <td style="text-align:left">产品ID</td>
+	        <td style="text-align:left">
+	        	<div class="long_content_div control-group ">
+				    <div class="controls">
+					    <span class="input-append "> 
+					            <input type="text" id="produtIds" name="produtIds" value="${dto.courseRuleConditionBean.value!}" placeholder="产品ID" class="input-medium">
+					            <button class="btn" type="button" id="productChooseBtn">选择</button>
+					    </span>
+				    </div>
+				</div>
+	        </td>	 
+        </tr>
+        <tr>
+	        <td style="text-align:left">资源ID</td>
+	        <td style="text-align:left">
+	        	<div class="long_content_div control-group ">
+				    <div class="controls">
+					    <span class="input-append "> 
+					            <input type="text" id="resourceIds" name="resourceIds" value="${dto.courseRuleConditionBean.resourceIds!}" placeholder="资源ID" class="input-medium">
+					            <button class="btn" type="button" id="resouceChooseBtn">选择</button>
+					    </span>
+				    </div>
+				</div>
+	        </td>	 
+        </tr>
+        
+        <tr>
+	        <td style="text-align:left">产品/资源使用日期</td>
+	        <td style="text-align:left">
+	        	<input type="text" id="productStartDate" name="productStartDate" value="${dto.courseRuleConditionBean.productStartDate?string("yyyy-MM-dd")}" placeholder="${dto.courseRuleConditionBean.productStartDate?string("yyyy-MM-dd")}" class="input-medium datetime">
+				~
+				<input type="text" id="productEndDate" name="productEndDate" value="${dto.courseRuleConditionBean.productEndDate?string("yyyy-MM-dd")}" placeholder="${dto.courseRuleConditionBean.productEndDate?string("yyyy-MM-dd")}" class="input-medium datetime">
+	        </td>	 
+        </tr>
+        </#if>
+        
         <#if dto.voucherType == 4 && dto.multiple==0 && dto.eventActivityRuleConditionBean.type != 1 >
         <#if dto.voucherType == 4 && dto.multiple==0 && dto.eventActivityRuleConditionBean.type != 1 >
         <tr>
         <tr>
         	<td style="text-align:left">产品ID</td>
         	<td style="text-align:left">产品ID</td>
@@ -427,6 +465,22 @@ function getResourceList(page){
 		            	</#if>
 		            	</#if>
 		            </td>
 		            </td>
 	            </#if>
 	            </#if>
+         	<#elseif dto.voucherType == 2>
+	            <#if dto.courseRuleConditionBean.type == 1>
+	            	<td style="text-align:left">全部类型适用</td>
+	            <#else>
+		            <td style="text-align:left;word-break: break-all;">
+		            	产品ID：[${dto.courseRuleConditionBean.value!}]&nbsp;&nbsp;
+		            	资源ID：[${dto.courseRuleConditionBean.resourceIds!}]&nbsp;&nbsp;
+		            	产品/资源使用日期：
+		            	<#if dto.courseRuleConditionBean.productStartDate??>
+		            		${dto.courseRuleConditionBean.productStartDate?string("yyyy-MM-dd HH:mm:ss")}
+		            	</#if> ~ 
+		            	<#if dto.courseRuleConditionBean.productEndDate??>
+		            		${dto.courseRuleConditionBean.productEndDate?string("yyyy-MM-dd HH:mm:ss")}
+		            	</#if>
+		            </td>
+	        </#if>
 	        <#elseif dto.voucherType == 3>
 	        <#elseif dto.voucherType == 3>
 	        	<td style="text-align:left">
 	        	<td style="text-align:left">
 	            	产品ID：[${dto.mallProductRuleConditionBean.value!}]&nbsp;&nbsp;
 	            	产品ID：[${dto.mallProductRuleConditionBean.value!}]&nbsp;&nbsp;