diff --git a/CRM.Visitors/Infos/Visitor.cs b/CRM.Visitors/Infos/Visitor.cs index a7ee2a2..5a11158 100644 --- a/CRM.Visitors/Infos/Visitor.cs +++ b/CRM.Visitors/Infos/Visitor.cs @@ -14,11 +14,12 @@ 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 + 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 } #region Public Properties public Int64 VisitorId { get; set; } + public Int64 AlternateNumber { get; set; } public Int32 PurposeOfVisit { get; set; } public int Title { get; set; } public int VisitorType { get; set; } @@ -68,7 +69,8 @@ namespace Bizgaze.CRM.Visitors.Infos public override Select GetQuery() { string[] columns = { - "v.mobilenumber", + "vn.mobilenumber", + "v.alternatenumber", "v.employeeid", "v.photourl", "v.installedappid", @@ -77,9 +79,9 @@ namespace Bizgaze.CRM.Visitors.Infos "v.accesscode", "v.visitorid", "v.code", - "v.emailid", + "ve.emailid", "v.FullName", - "v.title", + "v.title", "v.FutureInvitation", "v.TimeOfVisit", "v.DateOfVisit", @@ -92,9 +94,9 @@ namespace Bizgaze.CRM.Visitors.Infos "concat(e.firstname, e.lastname) AS HostName", "Case when title=1 then 'Mr' when title=2 then 'Miss' end as TitleName", }; - var a = 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")); - return a; + 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")); + } } }