yiming/17168ERP
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

修改挂单功能

Browse Source
This commit is contained in:
HUANGBANGLIN
2025-09-09 16:25:28 +08:00
parent e6c6b1f43f
commit ded24a8446
23 changed files with 1073 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
web/App_Code/api/regionController.cs
View File

@@ -11,7 +11,7 @@ using System.Web.Routing;
/// regionController 的摘要描述
/// </summary>
[ezAuthorize]
public class regionController: ApiController
public class regionController : ApiController
{
private Model.ezEntities _db = new Model.ezEntities();
public regionController()
@@ -95,17 +95,18 @@ public class regionController: ApiController
bed.Name,
bed.Gender,
bed.RoomUuid,
bed.StatusUuid,
bed.StatusCode,
bed.IsActive,
bed.IsDeleted,
canuse = bed.IsAvailableDuring(startDate, endDate, _db),
statusname = bed.RegionRoomBedStatus.Name,
schedules = _db.RegionAndRoomAndBedSchedule
.Where(s => s.IsCancel == false)
.Where(s => s.TargetUuid == bed.Uuid
&& s.IsDeleted == false
&& s.IsActive
&& (s.ScheduleDate == null
|| (s.ScheduleDate >= startDate && s.ScheduleDate <= endDate)))
.Where(s => s.GuaDanOrderGuest.StatusCode != "403" && s.GuaDanOrderGuest.StatusCode != "404")
.Select(s => new
{
s.Uuid,
@@ -113,7 +114,15 @@ public class regionController: ApiController
s.UseType,
s.Title,
s.Description,
s.GuaDanOrderNo
s.GuaDanOrderNo,
s.TargetUuid,
usename = _db.GuaDanOrderGuest
.Where(guest => guest.GuaDanOrderNo == s.GuaDanOrderNo)
.Where(guest => guest.BedUuid == s.TargetUuid)
.Select(guest => guest.followers.u_name)
.FirstOrDefault()
})
.ToList()
}),
@@ -183,7 +192,8 @@ public class regionController: ApiController
IsActive = region.IsActive,
RoomCount = region.RoomCount,
BedDto = new List<BedDto>(),
Rooms = region.Room.Select(a => new RoomDto {
Rooms = region.Room.Select(a => new RoomDto
{
Uuid = a.Uuid,
Name = a.Name,
RegionUuid = a.RegionUuid,
@@ -194,13 +204,13 @@ public class regionController: ApiController
{
Uuid = c.Uuid,
name = c.Name,
roomUuid = c.RoomUuid,
roomUuid = c.RoomUuid,
isactive = c.IsActive,
statusuuid = c.StatusUuid,
statuscode = c.StatusCode,
Gender = c.Gender,
}).ToList(),
}).ToList(),
Children = allRegions
.Where(r => r.ParentUuid == region.Uuid)
@@ -251,7 +261,7 @@ public class regionController: ApiController
name = c.Name,
roomUuid = c.RoomUuid,
isactive = c.IsActive,
statusuuid = c.StatusUuid
statuscode = c.StatusCode,
}).ToList()
})
.ToList();
@@ -281,7 +291,7 @@ public class regionController: ApiController
BedDto = new List<BedDto>(),
Children = children,
Gender = region.Gender,
};
}
@@ -303,11 +313,12 @@ public class regionController: ApiController
public Nullable<System.DateTime> UpdatedAt { get; set; }
public List<BedDto> beds { get; set; }
}
public class BedDto {
public class BedDto
{
public Guid Uuid { get; set; }
public Guid? roomUuid { get; set; }
public string name { get; set; }
public Guid? statusuuid { get; set; }
public string statuscode { get; set; }
public bool isactive { get; set; }
public bool Gender { get; set; }
}
@@ -324,13 +335,13 @@ public class regionController: ApiController
public bool IsActive { get; set; } = true;
public int? RoomCount { get; set; }
public List<RoomDto> Rooms { get; set; }
public List<BedDto> BedDto { get; set; }
public bool? Gender { get; set; }
public List<BedDto> BedDto { get; set; }
public bool? Gender { get; set; }
}
[HttpPost]
[Route("api/region/create")]
public IHttpActionResult createRegion([FromBody] RegionDto dto)
public IHttpActionResult createRegion([FromBody] RegionDto dto)
{
if (string.IsNullOrWhiteSpace(dto.Name))
return BadRequest("區域名稱為必填");
@@ -412,7 +423,7 @@ public class regionController: ApiController
[HttpPost]
[Route("api/region/getRegionType")]
public IHttpActionResult getRegionType()
{
{
var data = _db.RegionType.Where(a => a.IsActive == true).ToList();
return Ok(data);
}
@@ -431,7 +442,9 @@ public class regionController: ApiController
r.Gender,
rooms = r.Room.Select(room => new
{
room.Uuid, room.Name, room.RegionUuid
room.Uuid,
room.Name,
room.RegionUuid
}).ToList()
}).ToList();
return Ok(data);