diff --git a/CRM.Visitors/Infos/Visitor.cs b/CRM.Visitors/Infos/Visitor.cs index d02a2d8..033fbbb 100644 --- a/CRM.Visitors/Infos/Visitor.cs +++ b/CRM.Visitors/Infos/Visitor.cs @@ -14,7 +14,7 @@ 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, CheckOutDate + 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 } #region Public Properties @@ -47,7 +47,6 @@ namespace Bizgaze.CRM.Visitors.Infos public Boolean FutureInvitation { get; set; } public DateTime TimeOfVisit { get; set; } public DateTime CheckInDate { get; set; } - public DateTime CheckOutDate { get; set; } public DateTime DateOfVisit { get; set; } public Boolean Agreement { get; set; } public string PhotoUrl { get; set; } @@ -95,14 +94,14 @@ namespace Bizgaze.CRM.Visitors.Infos "v.purposeofvisit", "ss.stagestatusname", "ss.refstatusid", - "vc.checkoutdate", "(select imageurl from bizgazecrm_companies where companyid="+CompanyId+") as imageurl", "Case when purposeofvisit=1 then 'Interview' when purposeofvisit=2 then 'Official Meeting' when purposeofvisit=3 then 'Meeting an Employee' when purposeofvisit=4 then 'Package Delivery' when purposeofvisit=5 then 'Others' end as purposeofvisittype", "concat(e.firstname, e.lastname) AS HostName", "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_visitorcheckout vc",Exp.EqColumns("v.visitorid", "vc.visitorid")); + 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")).InnerJoin("bizgazecrm_visitornumbers vn", Exp.EqColumns("vn.visitorid", "v.visitorid")).InnerJoin("bizgazecrm_visitoremails ve", Exp.EqColumns("ve.visitorid", "v.visitorid")); + return a; } } }