add order by in communeResource

src/main/java/com/ctrip/fun/golf/dao/assemble/AsmCourseResourceDao.java

@@ -896,7 +896,7 @@ public class AsmCourseResourceDao extends GenericHibernateDao<AsmCourseresource,
         sqlUnion.append(" UNION ( ");
         sqlUnion.append(" UNION ( ");
         sqlUnion.append(sql2.toString());
         sqlUnion.append(sql2.toString());
         sqlUnion.append(" )");
         sqlUnion.append(" )");
-        sqlUnion.append(" ) u ");
+        sqlUnion.append(" ) u order by u.priceDate");
         
         
         sql.append(sqlUnion.toString());
         sql.append(sqlUnion.toString());
         sql_count.append(sqlUnion.toString());
         sql_count.append(sqlUnion.toString());

src/main/java/com/ctrip/fun/golf/service/assemble/AsmCourseResourceService.java

@@ -602,8 +602,8 @@ public class AsmCourseResourceService {
 	    		String priceDateStr = df.format(priceDate);
 	    		String priceDateStr = df.format(priceDate);
 	    		int index = containDate(v4list,priceDateStr);
 	    		int index = containDate(v4list,priceDateStr);
 	    		CommuneResourceV4PriceBean bean = new CommuneResourceV4PriceBean();
 	    		CommuneResourceV4PriceBean bean = new CommuneResourceV4PriceBean();
+	    		
 	    		String productName = asm.getProductName();
 	    		String productName = asm.getProductName();
-	    		//System.out.println(productName.getBytes());
 	    		String simpleProductName = "";
 	    		String simpleProductName = "";
 	    		if(productName!=null && productName.length()>2){
 	    		if(productName!=null && productName.length()>2){
 		            int endIndex = productName.indexOf("爱玩公社");
 		            int endIndex = productName.indexOf("爱玩公社");
@@ -641,7 +641,7 @@ public class AsmCourseResourceService {
     }
     }
 
 
     /**
     /**
-     * 判断某个 List<Map<Date, List<CommuneResourceBean>>> v4list  是否包含key为priceDate的Map元素
+     * 判断某个 List<CommuneResourceV4> v4list  是否包含CommuneResourceV4.priceDate为priceDateStr的元素
      * @param priceDateStr 
      * @param priceDateStr 
      * @param v4list 
      * @param v4list 
      * @param v4list
      * @param v4list