diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/FavoriteMaintain_QryService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/FavoriteMaintain_QryService.cs index 5e94b93..5bc82da 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/FavoriteMaintain_QryService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/FavoriteMaintain_QryService.cs @@ -223,6 +223,39 @@ namespace EasyBL.WEBAPP.SYS } + public Dictionary QueryExhibitionStatusList(string sLanguageID, string sAccount) + { + + var rsStatusDic = new Dictionary(); + + if (string.IsNullOrEmpty(sLanguageID)) + { + sLanguageID = WebAppGlobalConstWord.DEFAULT_LANGUAGE; + } + + var rsExhibitionList = FindFavoriateExhibitionByIDsAsDictionary(sLanguageID, sAccount).Values.ToList(); + + ExhibMaintain_QryService em_qry = new ExhibMaintain_QryService(); + var rsExhibStatusDic = em_qry.QueryShowStatusDic(sLanguageID); + + foreach (var Exhibition in rsExhibitionList) + { + + if (!string.IsNullOrEmpty(Exhibition.Status)) + { + if (rsExhibStatusDic.ContainsKey(Exhibition.Status)) { + var rsStatus = rsExhibStatusDic[Exhibition.Status]; + rsStatusDic[rsStatus.Key] = rsStatus; + } + + } + + } + + return rsStatusDic; + + } + diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/FavoriteService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/FavoriteService.cs index 2746302..d56e9d0 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/FavoriteService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/FavoriteService.cs @@ -222,6 +222,43 @@ namespace EasyBL.WEBAPP.SYS } + public HttpResponseMessage GetExhibitionStatusList(string sLanguageID, string sAccount) + { + + SuccessResponseMessage srm = null; + string sError = null; + + try + { + do + { + + FavoriteMaintain_QryService fm_qry = new FavoriteMaintain_QryService(); + var rsResult = fm_qry.QueryExhibitionStatusList(sLanguageID, sAccount).Values.ToList(); + + + //返回token信息 + srm = new SuccessResponseMessage(null, null); + + srm.DATA.Add(BLWording.REL, rsResult); + + } while (false); + } + catch (Exception ex) + { + sError = Util.GetLastExceptionMsg(ex); + srm = new SuccessResponseMessage(null, null) + { + STATUSCODE = (int)StatusCodeEnum.Error, + MSG = StatusCodeEnum.Error.GetEnumText() + }; + srm.DATA.Add(BLWording.REL, ""); + } + + return HttpResponseExtension.ToJson(JsonConvert.SerializeObject(srm)); + + } + private List FavoriteEntityToDTO(Object Data) { diff --git a/EuroTran/WebApp/Controllers/FavoriteController.cs b/EuroTran/WebApp/Controllers/FavoriteController.cs index 18d3db9..5973d63 100644 --- a/EuroTran/WebApp/Controllers/FavoriteController.cs +++ b/EuroTran/WebApp/Controllers/FavoriteController.cs @@ -106,5 +106,18 @@ namespace WebApp.Controllers } + [HttpGet] + [SEApiSecurityFilter] + public HttpResponseMessage ExhibitionStatusList(string Lang) + { + + // get authtoken + var SEToken = SETokenUtil.GetToken(this.Request); + var sAccount = SEToken.Email; + + return new FavoriteService().GetExhibitionStatusList(Lang, sAccount); + + } + } }