kunamvijaya 1 рік тому
джерело
коміт
b69823dd43
1 змінених файлів з 6 додано та 7 видалено
  1. 6
    7
      CRM.Visitors/Infos/Visitor.cs

+ 6
- 7
CRM.Visitors/Infos/Visitor.cs Переглянути файл

@@ -14,13 +14,11 @@ namespace Bizgaze.CRM.Visitors.Infos
14 14
     {
15 15
         public enum Property
16 16
         {
17
-            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
17
+            VisitorId, StageId, TenantId, StatusId, PurposeOfVisit, Title, SeriesId, Code, Reason, EmailId, 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, CityName, CityId, CheckInDate
18 18
 
19 19
         }
20 20
         #region Public Properties
21 21
         public Int64 VisitorId { get; set; }
22
-        public Int64 CityId { get; set; }
23
-        public string CityName { get; set; }
24 22
         public Int64 VisitorEmailId { get; set; }
25 23
         public Int64 VisitorNumberId { get; set; }
26 24
         public Int64 AlternateNumber { get; set; }
@@ -55,6 +53,8 @@ namespace Bizgaze.CRM.Visitors.Infos
55 53
         public string PhotoUrl { get; set; }
56 54
         public string ImageUrl { get; set; }
57 55
         public DateTime LastUpdatedDate { get; set; }
56
+        public string CityName { get; set; }
57
+        public Int64 CityId { get; set; }
58 58
         #endregion
59 59
         public string __TableName
60 60
         {
@@ -76,7 +76,6 @@ namespace Bizgaze.CRM.Visitors.Infos
76 76
 
77 77
             string[] columns = {
78 78
                 "v.cityid",
79
-                "ci.cityname",
80 79
                 "vn.mobilenumber",
81 80
                 "v.alternatenumber",
82 81
                 "v.employeeid",
@@ -105,16 +104,16 @@ namespace Bizgaze.CRM.Visitors.Infos
105 104
                  "v.tenantid",
106 105
                  "v.visitortype",
107 106
                  "v.seriesid",
108
-                 "v.agreement",                
107
+                 "v.agreement",
109 108
                  "v.lastupdateddate",
110
-                 "v.versionguid",
109
+                 "v.versionguid","ci.cityname",
111 110
                  "(select imageurl from bizgazecrm_companies where companyid="+CompanyId+") as imageurl",
112 111
             "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",
113 112
                 "concat(e.firstname, e.lastname) AS HostName",
114 113
                 "Case when title=1 then 'Mr'  when title=2  then 'Miss' end as TitleName",
115 114
                 };
116 115
             return new Select("bizgazecrm_visitors v").Columns(columns).
117
-                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"));
116
+                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"));
118 117
 
119 118
         }
120 119
     }

Завантаження…
Відмінити
Зберегти