feat:bug fixed
parent
14144129d8
commit
fee655541e
|
|
@ -281,6 +281,7 @@ namespace New_College.Api.Controllers
|
||||||
Expression<Func<D_PlanMajorScoreLine, bool>> expression = Expressionable.Create<D_PlanMajorScoreLine>()
|
Expression<Func<D_PlanMajorScoreLine, bool>> expression = Expressionable.Create<D_PlanMajorScoreLine>()
|
||||||
.And(c => c.UId == request.Uid)
|
.And(c => c.UId == request.Uid)
|
||||||
.And(c => c.IsDelete == false)
|
.And(c => c.IsDelete == false)
|
||||||
|
.And(c=>!string.IsNullOrEmpty(c.SelectSubject))
|
||||||
.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName)
|
.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName)
|
||||||
.AndIF(request.Year.HasValue && request.Year > 0, c => c.Years == request.Year)
|
.AndIF(request.Year.HasValue && request.Year > 0, c => c.Years == request.Year)
|
||||||
.ToExpression();
|
.ToExpression();
|
||||||
|
|
@ -291,7 +292,7 @@ namespace New_College.Api.Controllers
|
||||||
UId = request.Uid,
|
UId = request.Uid,
|
||||||
LowScore = c.LowScore,
|
LowScore = c.LowScore,
|
||||||
LowScoreRank = c.LowScoreRank,
|
LowScoreRank = c.LowScoreRank,
|
||||||
AvgScore = c.AvgScore != "-" ? int.Parse(c.AvgScore) <= c.LowScore ? "-" : c.AvgScore : "-",
|
AvgScore = c.AvgScore,
|
||||||
Years = c.Years,
|
Years = c.Years,
|
||||||
FirstType = c.FirstType,
|
FirstType = c.FirstType,
|
||||||
HighScore = c.HighScore,
|
HighScore = c.HighScore,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue