From 438654358ba3a2064c77d53d743dc435c0d9a10f Mon Sep 17 00:00:00 2001 From: berlin-tzen Date: Fri, 31 Mar 2023 10:52:21 +0800 Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E4=BF=AE=E6=AD=A3=E5=B1=95=E8=A6=BD?= =?UTF-8?q?=E8=8B=B1=E6=96=87&=E7=B0=A1=E7=A8=B1API=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E5=B1=95=E8=A6=BDAPI=E6=95=88=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShowEasy/ExhibMaintain_QryService.cs | 52 ++++++++++++++++--- .../ShowEasy/ExhibitionService.cs | 2 - 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibMaintain_QryService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibMaintain_QryService.cs index eabf3e5..701976e 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibMaintain_QryService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibMaintain_QryService.cs @@ -767,6 +767,46 @@ namespace EasyBL.WEBAPP.SYS #endregion 展覽管理（Dictionary 以ID查詢所有展覽） + #region 展覽管理（List 查詢所有展覽） + + public List FindAllByIDsAsList() + { + + var db = SugarBase.GetIntance(); + string sMsg = null; + + List saDataList = new List(); + + try + { + do + { + + saDataList = db.Queryable() + + .Where(t1 => t1.Effective == "Y") + .Where(t1 => t1.DelStatus == "N") + .Select(t1 => new View_CMS_Exhibition + { + ExhibitionID = SqlFunc.GetSelfAndAutoFill(t1.ExhibitionID), + + }) + .ToList(); + + return saDataList; + + } while (false); + } + catch (Exception ex) + { + sMsg = Util.GetLastExceptionMsg(ex); + } + + return saDataList; + } + + #endregion 展覽管理（List 查詢所有展覽） + #region 展覽管理（List 查詢所有展覽列表卡片） public List QueryExhibitionCard( string sLanguageID, @@ -845,9 +885,6 @@ namespace EasyBL.WEBAPP.SYS if (sSortType == "ShowDate") { - var CurrentDate = DateTime.Now; - System.Diagnostics.Debug.WriteLine(CurrentDate); - Cards = Cards.OrderByDescending(o => (o.StartDate - DateTime.Now)).ToList(); } @@ -1368,16 +1405,15 @@ namespace EasyBL.WEBAPP.SYS Dictionary rsResult = new Dictionary(); - var ExhibitionDic = FindAllByIDsAsDictionary(""); + var AllExhibitionList = FindAllByIDsAsList(); - var ExhibitionList = ExhibitionDic.Values.Where(w => w.LanguageID == sLanguageID).ToList(); - var ExhibitionEngList = ExhibitionDic.Values.Where(w => w.LanguageID == WebAppGlobalConstWord.EN_US).ToList(); + var ExhibitionList = AllExhibitionList.Where(w => w.LanguageID == sLanguageID).ToList(); + var ExhibitionENList = AllExhibitionList.Where(w => w.LanguageID == WebAppGlobalConstWord.EN_US).ToList(); ExhibInfoMaintain_QryService eim_qry = new ExhibInfoMaintain_QryService(); 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(); @@ -1417,7 +1453,7 @@ namespace EasyBL.WEBAPP.SYS string sENName = null; - var EngExhibition = ExhibitionDic.Values.Where(w => w.LanguageID == WebAppGlobalConstWord.EN_US).FirstOrDefault(); + var EngExhibition = ExhibitionENList.Where(w => w.ExhibitionID == Exhibition.ExhibitionID).FirstOrDefault(); if (EngExhibition != null) { sENName = EngExhibition.ExhibitionName; diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibitionService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibitionService.cs index 4496ab3..e135bad 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibitionService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibitionService.cs @@ -418,8 +418,6 @@ namespace EasyBL.WEBAPP.SYS rsResult = rsResult.Skip(iPageSize * (iPageIndex - 1)).Take(iPageSize).ToList(); - System.Diagnostics.Debug.WriteLine("Cards.Count" + ": " + rsResult.Count); - pml.DataList = rsResult.ToList(); //返回token信息