Commit 82565612 authored by 黄奎's avatar 黄奎

新增字段

parent 463f067d
...@@ -17,7 +17,12 @@ namespace Edu.Model.Entity.Question ...@@ -17,7 +17,12 @@ namespace Edu.Model.Entity.Question
public int BankId { get; set; } public int BankId { get; set; }
/// <summary> /// <summary>
/// BankName /// 题库编号
/// </summary>
public string BankNo { get; set; }
/// <summary>
/// 题库名称
/// </summary> /// </summary>
public string BankName { get; set; } public string BankName { get; set; }
......
...@@ -65,7 +65,8 @@ namespace Edu.Module.Question ...@@ -65,7 +65,8 @@ namespace Edu.Module.Question
{ {
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{nameof(RB_Question_Bank_ViewModel.BankName), model.BankName } {nameof(RB_Question_Bank_ViewModel.BankName), model.BankName },
{nameof(RB_Question_Bank_ViewModel.BankNo), model.BankNo },
}; };
flag = question_BankRepository.Update(fileds, new WhereHelper(nameof(RB_Question_Bank_ViewModel.BankId), model.BankId)); flag = question_BankRepository.Update(fileds, new WhereHelper(nameof(RB_Question_Bank_ViewModel.BankId), model.BankId));
} }
......
...@@ -48,10 +48,10 @@ WHERE 1=1 "); ...@@ -48,10 +48,10 @@ WHERE 1=1 ");
} }
if (!string.IsNullOrEmpty(query.BankName)) if (!string.IsNullOrEmpty(query.BankName))
{ {
builder.AppendFormat(" AND A.{0} LIKE @BankName ", nameof(RB_Question_Bank_ViewModel.BankName)); builder.AppendFormat(" AND (A.{0} LIKE @BankName OR A.{1} LIKE @BankName)", nameof(RB_Question_Bank_ViewModel.BankName), nameof(RB_Question_Bank_ViewModel.BankNo));
parameters.Add("BankName", "%" + query.BankName.Trim() + "%"); parameters.Add("BankName", "%" + query.BankName.Trim() + "%");
} }
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Question_Bank_ViewModel.BankId)); builder.AppendFormat(" ORDER BY A.{0} ASC ", nameof(RB_Question_Bank_ViewModel.BankNo));
return GetPage<RB_Question_Bank_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList(); return GetPage<RB_Question_Bank_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
} }
} }
......
...@@ -44,6 +44,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -44,6 +44,7 @@ namespace Edu.WebApi.Controllers.Course
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
var list = questionModule.GetQuestionBankPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var list = questionModule.GetQuestionBankPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
List<object> resultList = new List<object>(); List<object> resultList = new List<object>();
int index = 1;
foreach (var item in list) foreach (var item in list)
{ {
if (item.CreateBy > 0) if (item.CreateBy > 0)
...@@ -52,11 +53,14 @@ namespace Edu.WebApi.Controllers.Course ...@@ -52,11 +53,14 @@ namespace Edu.WebApi.Controllers.Course
} }
resultList.Add(new resultList.Add(new
{ {
RowNum=(pageModel.PageIndex-1)* pageModel.PageSize+index,
item.BankId, item.BankId,
item.BankNo,
item.BankName, item.BankName,
item.CreateByName, item.CreateByName,
item.QuestionCount item.QuestionCount
}); });
index++;
} }
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
pageModel.PageData = resultList; pageModel.PageData = resultList;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment