From e1234478332a577f904f5fe689ef7da3ee6083aa Mon Sep 17 00:00:00 2001 From: berlin-tzen Date: Sat, 11 Mar 2023 15:16:46 +0800 Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E4=BF=AE=E6=AD=A3=E5=9C=8B=E5=AE=B6?= =?UTF-8?q?=E7=84=A6=E9=BB=9E=E5=B1=95=E8=A6=BD=E5=88=97=E8=A1=A8API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShowEasy/ExhibMaintain_QryService.cs | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibMaintain_QryService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibMaintain_QryService.cs index 513c1b6..89b7fbb 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibMaintain_QryService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibMaintain_QryService.cs @@ -1660,8 +1660,7 @@ namespace EasyBL.WEBAPP.SYS List MainCategoryList = Exhibition.MainCategories; - ExhibitionDTO ExhibDTO = new ExhibitionDTO(); - + // Create categories foreach (var MainCategory in MainCategoryList) { @@ -1670,20 +1669,33 @@ namespace EasyBL.WEBAPP.SYS rsCategoryExhibition.CategoryID = MainCategory.CategoryID; rsCategoryExhibition.CategoryName = MainCategory.CategoryName; - rsCategoryExhibition.ExhibitionDic[Exhibition.ExhibitionID] = Exhibition; - rsResult[MainCategory.CategoryID] = rsCategoryExhibition; } } + // add Exhibition into categories + foreach (var Exhibition in rsExhibitionList) + { + List MainCategoryList = Exhibition.MainCategories; + + foreach (var MainCategory in MainCategoryList) { + + rsResult[MainCategory.CategoryID].ExhibitionDic[Exhibition.ExhibitionID] = Exhibition; + + } + + } + + // Convert Dic to List foreach (KeyValuePair CM in rsResult) { var sCategoryID = CM.Key; - rsResult[sCategoryID].ExhibitionList = rsResult[sCategoryID].ExhibitionDic.Values.ToList(); + rsResult[sCategoryID].ExhibitionList = rsResult[sCategoryID].ExhibitionDic.Values + .OrderByDescending(o => o.StartDate).ToList(); }