Commit dd338df7 authored by 吴春's avatar 吴春

1

parent 93c0d591
...@@ -53,7 +53,7 @@ namespace Edu.Model.Entity.AI ...@@ -53,7 +53,7 @@ namespace Edu.Model.Entity.AI
/// </summary> /// </summary>
public int SupplierId { get; set; } public int SupplierId { get; set; }
/// <summary> /// <summary>
/// 创建人 /// 创建人
/// </summary> /// </summary>
...@@ -93,5 +93,10 @@ namespace Edu.Model.Entity.AI ...@@ -93,5 +93,10 @@ namespace Edu.Model.Entity.AI
/// 是否启用 1-启用,2-禁用 /// 是否启用 1-启用,2-禁用
/// </summary> /// </summary>
public int Enable { get; set; } public int Enable { get; set; }
/// <summary>
/// 语言类型 LanguageType 1-英文,2-中文
/// </summary>
public int LanguageType { get; set; }
} }
} }
...@@ -36,6 +36,10 @@ namespace Edu.Repository.AI ...@@ -36,6 +36,10 @@ namespace Edu.Repository.AI
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.ID), query.ID); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.ID), query.ID);
} }
if (query.LanguageType > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.LanguageType), query.LanguageType);
}
if (query.School_Id > 0) if (query.School_Id > 0)
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.School_Id), query.School_Id); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.School_Id), query.School_Id);
...@@ -77,6 +81,10 @@ namespace Edu.Repository.AI ...@@ -77,6 +81,10 @@ namespace Edu.Repository.AI
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.ID), query.ID); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.ID), query.ID);
} }
if (query.LanguageType > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.LanguageType), query.LanguageType);
}
if (query.School_Id > 0) if (query.School_Id > 0)
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.School_Id), query.School_Id); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.School_Id), query.School_Id);
...@@ -136,6 +144,10 @@ namespace Edu.Repository.AI ...@@ -136,6 +144,10 @@ namespace Edu.Repository.AI
{ {
builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_AI_Supplier_ViewModel.SupplierType), query.SupplierType); builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_AI_Supplier_ViewModel.SupplierType), query.SupplierType);
} }
if (query.LanguageType > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.LanguageType), query.LanguageType);
}
if (query.Enable > 0) if (query.Enable > 0)
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.Enable), query.Enable); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.Enable), query.Enable);
...@@ -190,6 +202,10 @@ namespace Edu.Repository.AI ...@@ -190,6 +202,10 @@ namespace Edu.Repository.AI
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.SupplierId), query.SupplierId); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.SupplierId), query.SupplierId);
} }
if (query.LanguageType > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_AI_PresetsApplication_ViewModel.LanguageType), query.LanguageType);
}
if (query.SupplierType > 0) if (query.SupplierType > 0)
{ {
builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_AI_Supplier_ViewModel.SupplierType), query.SupplierType); builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_AI_Supplier_ViewModel.SupplierType), query.SupplierType);
......
...@@ -230,6 +230,7 @@ namespace Edu.WebApi.Controllers.AI ...@@ -230,6 +230,7 @@ namespace Edu.WebApi.Controllers.AI
SupplierName = extModel?.SupplierName ?? "", SupplierName = extModel?.SupplierName ?? "",
SupplierId = extModel?.SupplierId ?? 0, SupplierId = extModel?.SupplierId ?? 0,
Enable = extModel?.Enable ?? 0, Enable = extModel?.Enable ?? 0,
LanguageType= extModel?.LanguageType??0,
CreateTime = StringHelper.FormatDateTimeStr(extModel.CreateTime), CreateTime = StringHelper.FormatDateTimeStr(extModel.CreateTime),
}); });
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
...@@ -260,6 +261,7 @@ namespace Edu.WebApi.Controllers.AI ...@@ -260,6 +261,7 @@ namespace Edu.WebApi.Controllers.AI
SupplierId = extModel?.SupplierId ?? 0, SupplierId = extModel?.SupplierId ?? 0,
Enable = extModel?.Enable ?? 0, Enable = extModel?.Enable ?? 0,
StudentNum = extModel?.StudentNum ?? 0, StudentNum = extModel?.StudentNum ?? 0,
LanguageType = extModel?.LanguageType ?? 0,
CreateTime = StringHelper.FormatDateTimeStr(extModel.CreateTime), CreateTime = StringHelper.FormatDateTimeStr(extModel.CreateTime),
}); });
return ApiResult.Success(data: result); return ApiResult.Success(data: result);
...@@ -291,6 +293,7 @@ namespace Edu.WebApi.Controllers.AI ...@@ -291,6 +293,7 @@ namespace Edu.WebApi.Controllers.AI
SupplierName = extModel?.SupplierName ?? "", SupplierName = extModel?.SupplierName ?? "",
SupplierId = extModel?.SupplierId ?? 0, SupplierId = extModel?.SupplierId ?? 0,
Enable = extModel?.Enable ?? 0, Enable = extModel?.Enable ?? 0,
LanguageType = extModel?.LanguageType ?? 0,
CreateTime = StringHelper.FormatDateTimeStr(extModel.CreateTime), CreateTime = StringHelper.FormatDateTimeStr(extModel.CreateTime),
}; };
return ApiResult.Success(data: result); return ApiResult.Success(data: result);
...@@ -315,6 +318,7 @@ namespace Edu.WebApi.Controllers.AI ...@@ -315,6 +318,7 @@ namespace Edu.WebApi.Controllers.AI
Describe = base.ParmJObj.GetStringValue("Describe"), Describe = base.ParmJObj.GetStringValue("Describe"),
SupplierId = base.ParmJObj.GetInt("SupplierId", 0), SupplierId = base.ParmJObj.GetInt("SupplierId", 0),
Enable = base.ParmJObj.GetInt("Enable", 0), Enable = base.ParmJObj.GetInt("Enable", 0),
LanguageType = base.ParmJObj.GetInt("LanguageType", 0),
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
CreateBy = UserInfo.Id, CreateBy = UserInfo.Id,
UpdateBy = UserInfo.Id, UpdateBy = UserInfo.Id,
......
...@@ -70,6 +70,7 @@ namespace Edu.WebApi.Controllers.AI ...@@ -70,6 +70,7 @@ namespace Edu.WebApi.Controllers.AI
StartDate = StringHelper.FormatDateTimeStr(extModel.StuStartDate), StartDate = StringHelper.FormatDateTimeStr(extModel.StuStartDate),
EndDate = StringHelper.FormatDateTimeStr(extModel.StuEndDate), EndDate = StringHelper.FormatDateTimeStr(extModel.StuEndDate),
CreateTime = StringHelper.FormatDateTimeStr(extModel.CreateTime), CreateTime = StringHelper.FormatDateTimeStr(extModel.CreateTime),
LanguageType = extModel?.LanguageType ?? 0,
}); });
return ApiResult.Success(data: result); return ApiResult.Success(data: result);
} }
...@@ -241,7 +242,7 @@ namespace Edu.WebApi.Controllers.AI ...@@ -241,7 +242,7 @@ namespace Edu.WebApi.Controllers.AI
public ApiResult GetYouDaoGrade() public ApiResult GetYouDaoGrade()
{ {
List<RB_AI_PresetsApplication_ViewModel> listChina = new List<RB_AI_PresetsApplication_ViewModel>(); List<RB_AI_PresetsApplication_ViewModel> listChina = new List<RB_AI_PresetsApplication_ViewModel>();
listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "一年级", Content = "g1"}); listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "一年级", Content = "g1" });
listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "二年级", Content = "g2" }); listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "二年级", Content = "g2" });
listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "三年级", Content = "g3" }); listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "三年级", Content = "g3" });
listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "四年级", Content = "g4" }); listChina.Add(new RB_AI_PresetsApplication_ViewModel { Describe = "四年级", Content = "g4" });
......
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