nelson.kai
/
ShowEasy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'Dev' of http://www.origtek.com:2999/nelson.kai/ShowEasy into Dev

Dev
Janie 2 years ago
parent
5a48a5260a e123447833
commit
b63769cce1
3 changed files with 60 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      EuroTran/EasyBL.WEBAPP/ShowEasy/CategoryMaintain_QryService.cs
  2. 84
      EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibMaintain_QryService.cs
  3. 4
      EuroTran/EasyBL.WEBAPP/ShowEasy/FileMaintain_QryService.cs

4
EuroTran/EasyBL.WEBAPP/ShowEasy/CategoryMaintain_QryService.cs
View File

@ -429,10 +429,6 @@ namespace EasyBL.WEBAPP.SYS
sLanguage = WebAppGlobalConstWord.DEFAULT_LANGUAGE;
}
if (string.IsNullOrEmpty(sCategoryType)) {
return saCategoryDic;
}
try
{
do

84
EuroTran/EasyBL.WEBAPP/ShowEasy/ExhibMaintain_QryService.cs
View File

@ -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];
CategoryDTO rsCategory = new CategoryDTO();
rsCategory.CategoryID = Category.CategoryID;
rsCategory.CategoryName = Category.CategoryName;
var Category = CategoryDic[MainCategoryID];
CategoryDTO rsCategory = new CategoryDTO();
rsCategory.CategoryID = Category.CategoryID;
rsCategory.CategoryName = Category.CategoryName;
rsExhibition.MainCategories.Add(rsCategory);
}
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];
CategoryDTO rsCategory = new CategoryDTO();
rsCategory.CategoryID = Category.CategoryID;
rsCategory.CategoryName = Category.CategoryName;
var Category = CategoryDic[SubCategoryID];
CategoryDTO rsCategory = new CategoryDTO();
rsCategory.CategoryID = Category.CategoryID;
rsCategory.CategoryName = Category.CategoryName;
rsExhibition.SubCategories.Add(rsCategory);
}
rsExhibition.SubCategories.Add(rsCategory);
}
}
@ -1548,12 +1562,18 @@ namespace EasyBL.WEBAPP.SYS
foreach (var OrganizerID in OrganizerIDList)
{
var Organizer = OrganizerDic[OrganizerID];
OrganizerDTO rsOrganizer = new OrganizerDTO();
rsOrganizer.OrganizerID = Organizer.OrganizerID;
rsOrganizer.OrganizerName = Organizer.OrganizerName;
rsExhibition.Organizers.Add(rsOrganizer);
if (OrganizerDic.ContainsKey(OrganizerID)) {
var Organizer = OrganizerDic[OrganizerID];
OrganizerDTO rsOrganizer = new OrganizerDTO();
rsOrganizer.OrganizerID = Organizer.OrganizerID;
rsOrganizer.OrganizerName = Organizer.OrganizerName;
rsExhibition.Organizers.Add(rsOrganizer);
}
}
}
@ -1640,8 +1660,7 @@ namespace EasyBL.WEBAPP.SYS
List<CategoryDTO> MainCategoryList = Exhibition.MainCategories;
ExhibitionDTO ExhibDTO = new ExhibitionDTO();
// Create categories
foreach (var MainCategory in MainCategoryList)
{
@ -1650,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<CategoryDTO> MainCategoryList = Exhibition.MainCategories;
foreach (var MainCategory in MainCategoryList) {
rsResult[MainCategory.CategoryID].ExhibitionDic[Exhibition.ExhibitionID] = Exhibition;
}
}
// Convert Dic to List
foreach (KeyValuePair<string, CategoryExhibitionDTO> 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();
}

4
EuroTran/EasyBL.WEBAPP/ShowEasy/FileMaintain_QryService.cs
View File

@ -30,10 +30,10 @@ namespace EasyBL.WEBAPP.SYS
do
{
//var sOrgID = WebAppGlobalConstWord.TG_ORGID;
var sOrgID = WebAppGlobalConstWord.TG_ORGID;
var rsList = db.Queryable<OTB_SYS_Files>()
//.WhereIF(!string.IsNullOrEmpty(sOrgID), t1 => t1.OrgID == sOrgID)
.WhereIF(!string.IsNullOrEmpty(sOrgID), t1 => t1.OrgID == sOrgID)
.WhereIF(!string.IsNullOrEmpty(sParentID), t1 => t1.ParentID == sParentID)
.ToList();

Write Preview
Loading…
Cancel
Save