diff --git a/CRM.Visitors/Infos/Visitor.cs b/CRM.Visitors/Infos/Visitor.cs index bb5b399..3cb4d40 100644 --- a/CRM.Visitors/Infos/Visitor.cs +++ b/CRM.Visitors/Infos/Visitor.cs @@ -14,11 +14,13 @@ namespace Bizgaze.CRM.Visitors.Infos { public enum Property { - VisitorId, StageId, TenantId, StatusId, PurposeOfVisit, Title, SeriesId, Code, Reason, EmailId, ComingFrom, VersionguId, MobileNumber, FullName, NewCheckIn, PreInvite, AccessCode, FutureInvitation, TimeOfVisit, DateOfVisit, HostName, OrganizationName, TitleName, VisitorType, TemplateId, Installedappid, PhotoUrl, CreatedDate, StageStatusName, RefStatusId, AlternateNumber, ImageUrl, VisitorNumberId, VisitorEmailId, Agreement, LastUpdatedDate,TypeofVisitor + VisitorId, StageId, TenantId, StatusId, PurposeOfVisit, Title, SeriesId, Code, Reason, EmailId, ComingFrom, VersionguId, MobileNumber, FullName, NewCheckIn, PreInvite, AccessCode, FutureInvitation, TimeOfVisit, DateOfVisit, HostName, OrganizationName, TitleName, VisitorType, TemplateId, Installedappid, PhotoUrl, CreatedDate, StageStatusName, RefStatusId, AlternateNumber, ImageUrl, VisitorNumberId, VisitorEmailId, Agreement, LastUpdatedDate,TypeofVisitor,CityId,CityName } #region Public Properties public Int64 VisitorId { get; set; } + public Int64 CityId { get; set; } + public string CityName { get; set; } public Int64 VisitorEmailId { get; set; } public Int64 VisitorNumberId { get; set; } public Int64 AlternateNumber { get; set; } @@ -73,6 +75,8 @@ namespace Bizgaze.CRM.Visitors.Infos Int64 CompanyId = srequest.Identity.Settings == null ? 0 : Convert.ToInt64(srequest.Identity.GetSetting("companyid").SettingValue); string[] columns = { + "v.cityid", + "ci.cityname", "vn.mobilenumber", "v.alternatenumber", "v.employeeid", @@ -110,7 +114,7 @@ namespace Bizgaze.CRM.Visitors.Infos "Case when title=1 then 'Mr' when title=2 then 'Miss' end as TitleName", }; return new Select("bizgazecrm_visitors v").Columns(columns). - InnerJoin("bizgazecrm_employees e", Exp.EqColumns("e.employeeid", "v.employeeid")).InnerJoin("unibase_stages s", Exp.EqColumns("v.stageid", "s.stageid")).InnerJoin("unibase_stagestatus ss", Exp.EqColumns("ss.stagestatusid", "s.stagestatusid")).InnerJoin("bizgazecrm_visitornumbers vn", Exp.EqColumns("vn.visitorid", "v.visitorid")).InnerJoin("bizgazecrm_visitoremails ve", Exp.EqColumns("ve.visitorid", "v.visitorid")); + InnerJoin("bizgazecrm_employees e", Exp.EqColumns("e.employeeid", "v.employeeid")).InnerJoin("unibase_stages s", Exp.EqColumns("v.stageid", "s.stageid")).InnerJoin("unibase_stagestatus ss", Exp.EqColumns("ss.stagestatusid", "s.stagestatusid")).InnerJoin("bizgazecrm_visitornumbers vn", Exp.EqColumns("vn.visitorid", "v.visitorid")).InnerJoin("bizgazecrm_visitoremails ve", Exp.EqColumns("ve.visitorid", "v.visitorid")).InnerJoin("bizgazecrm_cities ci",Exp.EqColumns("v.cityid","ci.cityid")); } }