diff --git a/data/SQL/guadan_script.sql b/data/SQL/guadan_script.sql index 581fd8f..d47a0cf 100644 Binary files a/data/SQL/guadan_script.sql and b/data/SQL/guadan_script.sql differ diff --git a/web/App_Code/Model/Model.Context.cs b/web/App_Code/Model/Model.Context.cs index 1e4989f..7b8c298 100644 --- a/web/App_Code/Model/Model.Context.cs +++ b/web/App_Code/Model/Model.Context.cs @@ -79,8 +79,17 @@ namespace Model public virtual DbSet family_members { get; set; } public virtual DbSet PostCitiy { get; set; } public virtual DbSet PostNumber { get; set; } - public virtual DbSet ShuWens { get; set; } + public virtual DbSet ShuWen { get; set; } public virtual DbSet transfer_register { get; set; } + public virtual DbSet GuaDanOrder { get; set; } + public virtual DbSet GuaDanOrderGuest { get; set; } + public virtual DbSet GuadanTimeSetting { get; set; } + public virtual DbSet Region { get; set; } + public virtual DbSet RegionAndRoomAndBedSchedule { get; set; } + public virtual DbSet RegionRoomBed { get; set; } + public virtual DbSet RegionRoomBedStatus { get; set; } + public virtual DbSet RegionType { get; set; } + public virtual DbSet Room { get; set; } public virtual int pager_eztrust(Nullable startRowIndex, Nullable pageSize, string tableName, string columnName, string sqlWhere, string orderBy, ObjectParameter rowCount) { diff --git a/web/App_Code/Model/Model.Designer.cs b/web/App_Code/Model/Model.Designer.cs index b708255..7cfed4e 100644 --- a/web/App_Code/Model/Model.Designer.cs +++ b/web/App_Code/Model/Model.Designer.cs @@ -1,4 +1,4 @@ -// T4 code generation is enabled for model 'D:\dev\ez\17168erp\git_gitea\web\App_Code\Model\Model.edmx'. +// T4 code generation is enabled for model 'D:\dev\ez\17168erp\git_17888\web\App_Code\Model\Model.edmx'. // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model // is open in the designer. diff --git a/web/App_Code/Model/Model.cs b/web/App_Code/Model/Model.cs index 39e7f5d..8688c37 100644 --- a/web/App_Code/Model/Model.cs +++ b/web/App_Code/Model/Model.cs @@ -441,6 +441,7 @@ namespace Model { this.members = new HashSet(); this.news = new HashSet(); + this.GuaDanOrders = new HashSet(); } public int num { get; set; } @@ -475,6 +476,8 @@ namespace Model public virtual ICollection members { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection news { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection GuaDanOrders { get; set; } } } namespace Model @@ -765,6 +768,8 @@ namespace Model this.family_members = new HashSet(); this.transfer_register = new HashSet(); this.transfer_register1 = new HashSet(); + this.GuaDanOrders = new HashSet(); + this.GuaDanOrderGuests = new HashSet(); } public int num { get; set; } @@ -824,6 +829,10 @@ namespace Model public virtual ICollection transfer_register { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection transfer_register1 { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection GuaDanOrders { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection GuaDanOrderGuests { get; set; } } } namespace Model @@ -846,6 +855,68 @@ namespace Model using System; using System.Collections.Generic; + public partial class GuaDanOrder + { + public Nullable StartDate { get; set; } + public Nullable EndDate { get; set; } + public Nullable CreateUser { get; set; } + public Nullable CreatedAt { get; set; } + public Nullable UpdatedAt { get; set; } + public string Notes { get; set; } + public string GuaDanOrderNo { get; set; } + public Nullable BookerFollowerNum { get; set; } + public string BookerName { get; set; } + public string BookerPhone { get; set; } + public bool IsDeleted { get; set; } + public System.Guid Uuid { get; set; } + + public virtual admin admin { get; set; } + public virtual follower follower { get; set; } + } +} +namespace Model +{ + using System; + using System.Collections.Generic; + + public partial class GuaDanOrderGuest + { + public string GuaDanOrderNo { get; set; } + public Nullable FollowerNum { get; set; } + public bool IsDeleted { get; set; } + public System.Guid Uuid { get; set; } + public Nullable RoomUuid { get; set; } + public Nullable BedUuid { get; set; } + public Nullable CheckInAt { get; set; } + public Nullable CheckOutAt { get; set; } + public Nullable statusUuid { get; set; } + + public virtual follower follower { get; set; } + public virtual RegionRoomBed RegionRoomBed { get; set; } + public virtual Room Room { get; set; } + public virtual RegionRoomBedStatus RegionRoomBedStatus { get; set; } + } +} +namespace Model +{ + using System; + using System.Collections.Generic; + + public partial class GuadanTimeSetting + { + public System.Guid Id { get; set; } + public string EarliestCheckIn { get; set; } + public string LatestCheckOut { get; set; } + public bool IsActive { get; set; } + public Nullable CreatedAt { get; set; } + public Nullable UpdatedAt { get; set; } + } +} +namespace Model +{ + using System; + using System.Collections.Generic; + public partial class item { public int num { get; set; } @@ -1274,6 +1345,171 @@ namespace Model using System; using System.Collections.Generic; + public partial class Region + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public Region() + { + this.Region1 = new HashSet(); + this.Room = new HashSet(); + } + + public string Name { get; set; } + public string Description { get; set; } + public Nullable SortOrder { get; set; } + public string CreatedBy { get; set; } + public Nullable CreatedAt { get; set; } + public Nullable UpdatedAt { get; set; } + public bool IsActive { get; set; } + public Nullable RoomCount { get; set; } + public bool IsDeleted { get; set; } + public System.Guid Uuid { get; set; } + public Nullable ParentUuid { get; set; } + public Nullable RegionTypeUuid { get; set; } + public Nullable Gender { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection Region1 { get; set; } + public virtual Region Region2 { get; set; } + public virtual RegionType RegionType { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection Room { get; set; } + } +} +namespace Model +{ + using System; + using System.Collections.Generic; + + public partial class RegionAndRoomAndBedSchedule + { + public int UseType { get; set; } + public string Title { get; set; } + public string Description { get; set; } + public string CreatedBy { get; set; } + public Nullable CreatedAt { get; set; } + public bool IsDeleted { get; set; } + public System.Guid Uuid { get; set; } + public Nullable TargetUuid { get; set; } + public string GuaDanOrderNo { get; set; } + public Nullable ScheduleDate { get; set; } + public bool IsActive { get; set; } + } +} +namespace Model +{ + using System; + using System.Collections.Generic; + + public partial class RegionRoomBed + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public RegionRoomBed() + { + this.GuaDanOrderGuests = new HashSet(); + } + + public string Name { get; set; } + public bool IsActive { get; set; } + public bool Gender { get; set; } + public bool IsDeleted { get; set; } + public System.Guid Uuid { get; set; } + public System.Guid RoomUuid { get; set; } + public Nullable StatusUuid { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection GuaDanOrderGuests { get; set; } + public virtual RegionRoomBedStatus RegionRoomBedStatus { get; set; } + public virtual Room Room { get; set; } + } +} +namespace Model +{ + using System; + using System.Collections.Generic; + + public partial class RegionRoomBedStatus + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public RegionRoomBedStatus() + { + this.GuaDanOrderGuests = new HashSet(); + this.RegionRoomBeds = new HashSet(); + } + + public string Code { get; set; } + public string Name { get; set; } + public string Description { get; set; } + public Nullable Category { get; set; } + public bool IsDeleted { get; set; } + public System.Guid Uuid { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection GuaDanOrderGuests { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection RegionRoomBeds { get; set; } + } +} +namespace Model +{ + using System; + using System.Collections.Generic; + + public partial class RegionType + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public RegionType() + { + this.Regions = new HashSet(); + } + + public string Code { get; set; } + public string Name { get; set; } + public bool IsActive { get; set; } + public Nullable CreateAt { get; set; } + public bool IsDeleted { get; set; } + public System.Guid Uuid { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection Regions { get; set; } + } +} +namespace Model +{ + using System; + using System.Collections.Generic; + + public partial class Room + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public Room() + { + this.GuaDanOrderGuests = new HashSet(); + this.RegionRoomBed = new HashSet(); + } + + public string Name { get; set; } + public bool Gender { get; set; } + public Nullable BedCount { get; set; } + public Nullable IsActive { get; set; } + public Nullable CreatedAt { get; set; } + public Nullable UpdatedAt { get; set; } + public bool IsDeleted { get; set; } + public System.Guid Uuid { get; set; } + public System.Guid RegionUuid { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection GuaDanOrderGuests { get; set; } + public virtual Region Region { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection RegionRoomBed { get; set; } + } +} +namespace Model +{ + using System; + using System.Collections.Generic; + public partial class ShuWen { public int ID { get; set; } diff --git a/web/App_Code/Model/Model.edmx b/web/App_Code/Model/Model.edmx index 637f243..aebea72 100644 --- a/web/App_Code/Model/Model.edmx +++ b/web/App_Code/Model/Model.edmx @@ -422,6 +422,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -659,6 +701,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1208,6 +1332,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1482,6 +1678,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1748,6 +2004,9 @@ + + + @@ -1764,6 +2023,12 @@ + + + + + + @@ -1905,6 +2170,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1993,6 +2282,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -2325,6 +2634,7 @@ + @@ -2514,6 +2824,8 @@ + + @@ -3972,7 +4284,7 @@ - + @@ -4014,6 +4326,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4287,6 +4652,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5115,7 +5755,7 @@ - + @@ -5160,6 +5800,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/App_Code/Model/Model.edmx.diagram b/web/App_Code/Model/Model.edmx.diagram index 58be36a..7f1c080 100644 --- a/web/App_Code/Model/Model.edmx.diagram +++ b/web/App_Code/Model/Model.edmx.diagram @@ -131,6 +131,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/web/App_Code/api/ShuWenController.cs b/web/App_Code/api/ShuWenController.cs index 5125ed0..e82b2dd 100644 --- a/web/App_Code/api/ShuWenController.cs +++ b/web/App_Code/api/ShuWenController.cs @@ -36,7 +36,7 @@ public class ShuWenController : ApiController { return BadRequest("請提供有效的 activitynum 參數。"); } - var shuwen = _db.ShuWens.Where(a => a.ActivityNum == activitynum).FirstOrDefault(); + var shuwen = _db.ShuWen.Where(a => a.ActivityNum == activitynum).FirstOrDefault(); if(shuwen == null) { return Ok(new { message = "1", data = shuwen, latest = false }); @@ -53,7 +53,7 @@ public class ShuWenController : ApiController { return BadRequest("請提供有效的 activitynum 參數。"); } - var shuwen = _db.ShuWens.Where(a => a.ActivityNum == activitynum).FirstOrDefault(); + var shuwen = _db.ShuWen.Where(a => a.ActivityNum == activitynum).FirstOrDefault(); if (shuwen == null) { var now = DateTime.Now; @@ -62,7 +62,7 @@ public class ShuWenController : ApiController shuwen.CreateTime = now; shuwen.UpdateTime = now; shuwen.IsGenerating = true; - _db.ShuWens.Add(shuwen); + _db.ShuWen.Add(shuwen); } else if (shuwen.IsGenerating) { @@ -222,7 +222,7 @@ public class ShuWenController : ApiController [Route("api/shuwen/download")] public HttpResponseMessage DownloadShuWenWord(int? activitynum) { - var data = _db.ShuWens.Where(a => a.ActivityNum == activitynum).FirstOrDefault(); + var data = _db.ShuWen.Where(a => a.ActivityNum == activitynum).FirstOrDefault(); if (data == null) { //return; diff --git a/web/App_Code/api/guadanOrderController.cs b/web/App_Code/api/guadanOrderController.cs index 8451a7d..68f8917 100644 --- a/web/App_Code/api/guadanOrderController.cs +++ b/web/App_Code/api/guadanOrderController.cs @@ -46,7 +46,7 @@ public class guadanOrderController: ApiController var result = new { order.admin, - order.followers, + order.follower, StartDate = order.StartDate?.ToString("yyyy-MM-dd"), EndDate = order.EndDate?.ToString("yyyy-MM-dd"), order.CreateUser, diff --git a/web/App_Code/api/guadanOrderGuestController.cs b/web/App_Code/api/guadanOrderGuestController.cs index 02f26b4..86a26e0 100644 --- a/web/App_Code/api/guadanOrderGuestController.cs +++ b/web/App_Code/api/guadanOrderGuestController.cs @@ -44,7 +44,7 @@ public class guadanOrderGuestController: ApiController roomName = a.Room.Name, bedName = a.RegionRoomBed.Name, orderNo = a.GuaDanOrderNo, - follower = a.followers, + follower = a.follower, statusUuid = a.statusUuid, statusName = a.RegionRoomBedStatus?.Name, }).ToList(); diff --git a/web/App_Code/api/guadanStatisticsController.cs b/web/App_Code/api/guadanStatisticsController.cs index 0832389..6d29e5c 100644 --- a/web/App_Code/api/guadanStatisticsController.cs +++ b/web/App_Code/api/guadanStatisticsController.cs @@ -33,13 +33,13 @@ public class guadanStatisticsController: ApiController var guadanTotalCount = await _db.GuaDanOrder.Where(a => a.IsDeleted == false).CountAsync(); var guadanPeopleTotal = await _db.GuaDanOrderGuest.Where(a => a.IsDeleted == false).CountAsync(); - var guadanPeopleMale = await _db.GuaDanOrderGuest.Where(a => a.IsDeleted == false && a.followers.sex == "男眾").CountAsync(); - var guadanPeopleFemale = await _db.GuaDanOrderGuest.Where(a => a.IsDeleted == false && a.followers.sex == "女眾").CountAsync(); + var guadanPeopleMale = await _db.GuaDanOrderGuest.Where(a => a.IsDeleted == false && a.follower.sex == "男眾").CountAsync(); + var guadanPeopleFemale = await _db.GuaDanOrderGuest.Where(a => a.IsDeleted == false && a.follower.sex == "女眾").CountAsync(); dynamic bedCounts = await RegionAndRoomAndBedSchedule.GetAvailableBedCountsAsync(_db, DateTime.Now, DateTime.Now); var guadanCurrentCount = await _db.GuaDanOrder.Where(a => now < a.EndDate).CountAsync(); var guadanPeopleCurrent = await _db.GuaDanOrderGuest.Where( a => a.CheckOutAt > now).CountAsync(); - var guadanPeopleCurrentMale = await _db.GuaDanOrderGuest.Where(a => a.CheckOutAt > now && a.followers.sex == "男眾").CountAsync(); - var guadanPeopleCurrentFemale = await _db.GuaDanOrderGuest.Where(a => a.CheckOutAt > now && a.followers.sex == "女眾").CountAsync(); + var guadanPeopleCurrentMale = await _db.GuaDanOrderGuest.Where(a => a.CheckOutAt > now && a.follower.sex == "男眾").CountAsync(); + var guadanPeopleCurrentFemale = await _db.GuaDanOrderGuest.Where(a => a.CheckOutAt > now && a.follower.sex == "女眾").CountAsync(); var result = new {