2321
This commit is contained in:
parent
abcda60338
commit
c832e74334
|
|
@ -283,10 +283,12 @@
|
|||
public const string CacheSQReservations = "CacheSQReservations";
|
||||
public const string CacheSQReservationParticipants = "CacheSQReservationParticipants";
|
||||
public const string CacheCoreCmsUserBlacklist = "CacheCoreCmsUserBlacklist";
|
||||
public const string CacheSQReservationEvaluate = "CacheSQReservationEvaluate";
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ namespace CoreCms.Net.Repository
|
|||
oldModel.role = entity.role;
|
||||
oldModel.play_level = entity.play_level;
|
||||
oldModel.skills_level = entity.skills_level;
|
||||
oldModel.is_arrive = entity.is_arrive;
|
||||
oldModel.created_at = entity.created_at;
|
||||
|
||||
//事物处理过程结束
|
||||
|
|
@ -213,7 +212,7 @@ namespace CoreCms.Net.Repository
|
|||
role = p.role,
|
||||
play_level = p.play_level,
|
||||
skills_level = p.skills_level,
|
||||
is_arrive = p.is_arrive,
|
||||
|
||||
created_at = p.created_at,
|
||||
|
||||
}).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount);
|
||||
|
|
@ -230,7 +229,7 @@ namespace CoreCms.Net.Repository
|
|||
role = p.role,
|
||||
play_level = p.play_level,
|
||||
skills_level = p.skills_level,
|
||||
is_arrive = p.is_arrive,
|
||||
|
||||
created_at = p.created_at,
|
||||
|
||||
}).ToPageListAsync(pageIndex, pageSize, totalCount);
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ using Microsoft.AspNetCore.Hosting;
|
|||
using Microsoft.AspNetCore.Mvc;
|
||||
using NPOI.HSSF.UserModel;
|
||||
using SqlSugar;
|
||||
using CoreCms.Net.Web.Admin.Infrastructure;
|
||||
|
||||
namespace CoreCms.Net.Web.Admin.Controllers
|
||||
{
|
||||
|
|
@ -76,7 +77,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
|
|||
|
||||
Expression<Func<SQReservationEvaluate, object>> orderEx = orderField switch
|
||||
{
|
||||
"id" => p => p.id,"reservation_id" => p => p.reservation_id,"user_id" => p => p.user_id,"role" => p => p.role,"play_level" => p => p.play_level,"skills_level" => p => p.skills_level,"is_arrive" => p => p.is_arrive,"created_at" => p => p.created_at,
|
||||
"id" => p => p.id,"reservation_id" => p => p.reservation_id,"user_id" => p => p.user_id,"role" => p => p.role,"play_level" => p => p.play_level,"skills_level" => p => p.skills_level,"created_at" => p => p.created_at,
|
||||
_ => p => p.id
|
||||
};
|
||||
|
||||
|
|
@ -126,12 +127,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
|
|||
{
|
||||
where = where.And(p => p.skills_level == skills_level);
|
||||
}
|
||||
//是否赴约 int
|
||||
var is_arrive = Request.Form["is_arrive"].FirstOrDefault().ObjectToInt(0);
|
||||
if (is_arrive > 0)
|
||||
{
|
||||
where = where.And(p => p.is_arrive == is_arrive);
|
||||
}
|
||||
|
||||
//评价时间 datetime
|
||||
var created_at = Request.Form["created_at"].FirstOrDefault();
|
||||
if (!string.IsNullOrEmpty(created_at))
|
||||
|
|
@ -415,7 +411,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
|
|||
rowTemp5.CellStyle = commonCellStyle;
|
||||
|
||||
var rowTemp6 = rowTemp.CreateCell(6);
|
||||
rowTemp6.SetCellValue(listModel[i].is_arrive.ToString());
|
||||
rowTemp6.SetCellValue("");
|
||||
rowTemp6.CellStyle = commonCellStyle;
|
||||
|
||||
var rowTemp7 = rowTemp.CreateCell(7);
|
||||
|
|
@ -496,12 +492,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
|
|||
{
|
||||
where = where.And(p => p.skills_level == skills_level);
|
||||
}
|
||||
//是否赴约 int
|
||||
var is_arrive = Request.Form["is_arrive"].FirstOrDefault().ObjectToInt(0);
|
||||
if (is_arrive > 0)
|
||||
{
|
||||
where = where.And(p => p.is_arrive == is_arrive);
|
||||
}
|
||||
|
||||
//评价时间 datetime
|
||||
var created_at = Request.Form["created_at"].FirstOrDefault();
|
||||
if (!string.IsNullOrEmpty(created_at))
|
||||
|
|
@ -607,7 +598,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
|
|||
|
||||
|
||||
var rowTemp6 = rowTemp.CreateCell(6);
|
||||
rowTemp6.SetCellValue(listModel[i].is_arrive.ToString());
|
||||
rowTemp6.SetCellValue("");
|
||||
rowTemp6.CellStyle = commonCellStyle;
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user