|
|
@ -9,6 +9,7 @@ using SqlSugar; |
|
|
|
using SqlSugar.Base; |
|
|
|
using System; |
|
|
|
using System.Collections.Generic; |
|
|
|
using System.Diagnostics; |
|
|
|
using System.Globalization; |
|
|
|
using System.Linq; |
|
|
|
|
|
|
@ -1392,7 +1393,6 @@ namespace EasyBL.WEBAPP.SYS |
|
|
|
|
|
|
|
var ExhibitionDic = FindAllByIDsAsDictionary(""); |
|
|
|
|
|
|
|
//var ExhibitionList = FindAllByIDsAsDictionary(sLanguageID).Values;
|
|
|
|
var ExhibitionList = ExhibitionDic.Values.Where(w => w.LanguageID == sLanguageID).ToList(); |
|
|
|
var ExhibitionEngList = ExhibitionDic.Values.Where(w => w.LanguageID == WebAppGlobalConstWord.EN_US).ToList(); |
|
|
|
|
|
|
@ -1400,14 +1400,20 @@ namespace EasyBL.WEBAPP.SYS |
|
|
|
var ExhibInfoDic = eim_qry.FindAllByIDsAsDictionary(sLanguageID, ""); |
|
|
|
var LocationDic = eim_qry.FindAllLocationByIDsAsDictionary(sLanguageID, "", ""); |
|
|
|
|
|
|
|
|
|
|
|
//System.Diagnostics.Debug.WriteLine("=====Start=====");
|
|
|
|
//System.Diagnostics.Stopwatch sw = new Stopwatch();
|
|
|
|
//sw.Start();
|
|
|
|
|
|
|
|
FileMaintain_QryService fm_qry = new FileMaintain_QryService(); |
|
|
|
var FileDic = fm_qry.FindAllByIDsAsDictionary(""); |
|
|
|
|
|
|
|
ExhibMainCategoryMaintain_QryService emcm_qry = new ExhibMainCategoryMaintain_QryService(); |
|
|
|
var MainCategoryDic = emcm_qry.QueryExhibMainCategoryAsDictionary(sLanguageID); |
|
|
|
//System.Diagnostics.Debug.WriteLine("=====End=====");
|
|
|
|
//sw.Stop();
|
|
|
|
//System.Diagnostics.Debug.WriteLine("Proc time: " + sw.ElapsedMilliseconds +" ms");
|
|
|
|
|
|
|
|
ExhibSubCategoryMaintain_QryService escm_qry = new ExhibSubCategoryMaintain_QryService(); |
|
|
|
var SubCategoryDic = escm_qry.QueryExhibSubCategoryAsDictionary(sLanguageID); |
|
|
|
CategoryMaintain_QryService cm_qry = new CategoryMaintain_QryService(); |
|
|
|
var CategoryDic = cm_qry.FindAllByIDsAsDictionary("", sLanguageID); |
|
|
|
|
|
|
|
VenueMaintain_QryService vm_qry = new VenueMaintain_QryService(); |
|
|
|
var VenueDic = vm_qry.FindAllByIDsAsDictionary(sLanguageID); |
|
|
@ -1429,7 +1435,7 @@ namespace EasyBL.WEBAPP.SYS |
|
|
|
|
|
|
|
var ExhibInfo = ExhibInfoDic.Values.ToList() |
|
|
|
.Where(w => w.ExhibitionID == Exhibition.ExhibitionID) |
|
|
|
.OrderBy(o => o.Year) |
|
|
|
.OrderBy(o => o.StartDate) |
|
|
|
.FirstOrDefault(); |
|
|
|
|
|
|
|
string sENName = null; |
|
|
@ -1463,13 +1469,17 @@ namespace EasyBL.WEBAPP.SYS |
|
|
|
|
|
|
|
foreach (var MainCategoryID in MainCategoryIDList) |
|
|
|
{ |
|
|
|
if (CategoryDic.ContainsKey(MainCategoryID)) { |
|
|
|
|
|
|
|
var Category = MainCategoryDic[MainCategoryID]; |
|
|
|
var Category = CategoryDic[MainCategoryID]; |
|
|
|
CategoryDTO rsCategory = new CategoryDTO(); |
|
|
|
rsCategory.CategoryID = Category.CategoryID; |
|
|
|
rsCategory.CategoryName = Category.CategoryName; |
|
|
|
|
|
|
|
rsExhibition.MainCategories.Add(rsCategory); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
@ -1481,13 +1491,17 @@ namespace EasyBL.WEBAPP.SYS |
|
|
|
|
|
|
|
foreach (var SubCategoryID in SubCategoryIDList) |
|
|
|
{ |
|
|
|
if (CategoryDic.ContainsKey(SubCategoryID)) { |
|
|
|
|
|
|
|
var Category = SubCategoryDic[SubCategoryID]; |
|
|
|
var Category = CategoryDic[SubCategoryID]; |
|
|
|
CategoryDTO rsCategory = new CategoryDTO(); |
|
|
|
rsCategory.CategoryID = Category.CategoryID; |
|
|
|
rsCategory.CategoryName = Category.CategoryName; |
|
|
|
|
|
|
|
rsExhibition.SubCategories.Add(rsCategory); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
@ -1548,12 +1562,18 @@ namespace EasyBL.WEBAPP.SYS |
|
|
|
|
|
|
|
foreach (var OrganizerID in OrganizerIDList) |
|
|
|
{ |
|
|
|
|
|
|
|
if (OrganizerDic.ContainsKey(OrganizerID)) { |
|
|
|
|
|
|
|
var Organizer = OrganizerDic[OrganizerID]; |
|
|
|
OrganizerDTO rsOrganizer = new OrganizerDTO(); |
|
|
|
rsOrganizer.OrganizerID = Organizer.OrganizerID; |
|
|
|
rsOrganizer.OrganizerName = Organizer.OrganizerName; |
|
|
|
|
|
|
|
rsExhibition.Organizers.Add(rsOrganizer); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|