[WHAT] 增加以展覽狀態搜尋會員收藏展覽列表

EuroTran/EasyBL.WEBAPP/ShowEasy/FavoriteMaintain_QryService.cs

@@ -132,7 +132,7 @@ namespace EasyBL.WEBAPP.SYS
         /// <param name="i_crm"></param>
         /// <returns></returns>
         ///
-        public Dictionary<string, ExhibitionCardDTO> QueryFavoriteExhibition(string sLanguageID, string sAccount, List<string> SubCategoryIDList, List<string> CountryIDList)
+        public Dictionary<string, ExhibitionCardDTO> QueryFavoriteExhibition(string sLanguageID, string sAccount, List<string> SubCategoryIDList, List<string> CountryIDList, List<string> StatusList)
         {
 
             if (string.IsNullOrEmpty(sLanguageID)) {
@@ -167,6 +167,11 @@ namespace EasyBL.WEBAPP.SYS
                 rsExhibitionList = em_qry.FilterByLocationIDs(rsExhibitionList, new List<string>(), CountryIDList, new List<string>());
             }
 
+            if (StatusList.Count > 0)
+            {
+                rsExhibitionList = em_qry.FilterByStatus(rsExhibitionList, StatusList);
+            }
+
             rsExhibitionList = rsExhibitionList.OrderByDescending(o => (o.StartDate - DateTime.Now)).ToList();
 
             foreach (var Exhibition in rsExhibitionList) {

EuroTran/EasyBL.WEBAPP/ShowEasy/FavoriteService.cs

@@ -123,7 +123,8 @@ namespace EasyBL.WEBAPP.SYS
             int iPageIndex, 
             int iPageSize, 
             List<string> SubCategoryIDList, 
-            List<string> CountryIDList )
+            List<string> CountryIDList,
+            List<string> StatusList )
         {
 
             SuccessResponseMessage srm = null;
@@ -135,7 +136,7 @@ namespace EasyBL.WEBAPP.SYS
                 {
 
                     FavoriteMaintain_QryService fm_qry = new FavoriteMaintain_QryService();
-                    var rsResult = fm_qry.QueryFavoriteExhibition(sLanguageID, sAccount, SubCategoryIDList, CountryIDList).Values.ToList();
+                    var rsResult = fm_qry.QueryFavoriteExhibition(sLanguageID, sAccount, SubCategoryIDList, CountryIDList, StatusList).Values.ToList();
 
                     // Pagination
                     if (iPageSize <= 0)

EuroTran/WebApp/Controllers/FavoriteController.cs

@@ -65,18 +65,24 @@ namespace WebApp.Controllers
 
         [HttpGet]
         [SEApiSecurityFilter]
-        public HttpResponseMessage ExhibitionList(string Lang, int PageIndex, int PageSize, string SubCategoryIDs, string CountryIDs)
+        public HttpResponseMessage ExhibitionList(string Lang, int PageIndex, int PageSize, string SubCategoryIDs, string CountryIDs, string Status)
         {
-            List<string> SubCategoryIDList = new List<string>();
-            List<string> CountryIDList = new List<string>();
+            List<string> rsSubCategoryIDList = new List<string>();
+            List<string> rsCountryIDList = new List<string>();
+            List<string> rsStatusList = new List<string>();
 
             if (!string.IsNullOrEmpty(SubCategoryIDs)) {
-                SubCategoryIDList = JsonConvert.DeserializeObject<List<string>>(SubCategoryIDs);
+                rsSubCategoryIDList = JsonConvert.DeserializeObject<List<string>>(SubCategoryIDs);
             }
 
             if (!string.IsNullOrEmpty(CountryIDs))
             {
-                CountryIDList = JsonConvert.DeserializeObject<List<string>>(CountryIDs);
+                rsCountryIDList = JsonConvert.DeserializeObject<List<string>>(CountryIDs);
+            }
+
+            if (!string.IsNullOrEmpty(Status))
+            {
+                rsStatusList = JsonConvert.DeserializeObject<List<string>>(Status);
             }
 
 
@@ -84,7 +90,7 @@ namespace WebApp.Controllers
             var SEToken = SETokenUtil.GetToken(this.Request);
             var sAccount = SEToken.Email;
 
-            return new FavoriteService().GetFavoriteExhibition(Lang, sAccount, PageIndex, PageSize, SubCategoryIDList, CountryIDList);
+            return new FavoriteService().GetFavoriteExhibition(Lang, sAccount, PageIndex, PageSize, rsSubCategoryIDList, rsCountryIDList, rsStatusList);
         }
 
     }