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

update ef-model

Browse Source
This commit is contained in:
yiming
2025-09-05 00:37:48 +08:00
parent 61502cb3bd
commit 3a40a33204
10 changed files with 1052 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/App_Code/api/ShuWenController.cs
View File

@@ -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;

2
web/App_Code/api/guadanOrderController.cs
View File

@@ -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,

2
web/App_Code/api/guadanOrderGuestController.cs
View File

@@ -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();

8
web/App_Code/api/guadanStatisticsController.cs
View File

@@ -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
{