Commit 7f718200 authored by 黄奎's avatar 黄奎

页面修改

parent 07237255
using Edu.Common.Plugin;
namespace Edu.Common.Enum.StudyAbroad
{
public enum StudyAbroadProductTypeEnum
{
/// <summary>
/// 公司自有产品
/// </summary>
[EnumField("公司自有产品")]
CompanyProduct = 1,
/// <summary>
/// 公司自有产品
/// </summary>
[EnumField("同业产品")]
B2BProduct = 2,
}
}
using Edu.Common.Enum; using Edu.Common.Enum;
using Edu.Common.Enum.Sale; using Edu.Common.Enum.Sale;
using Edu.Common.Enum.StudyAbroad;
using System; using System;
using VT.FW.DB; using VT.FW.DB;
...@@ -137,5 +138,9 @@ namespace Edu.Model.Entity.StudyAbroad ...@@ -137,5 +138,9 @@ namespace Edu.Model.Entity.StudyAbroad
/// </summary> /// </summary>
public string ImgCover { get; set; } public string ImgCover { get; set; }
/// <summary>
/// 产品类型
/// </summary>
public StudyAbroadProductTypeEnum ProductType { get; set; }
} }
} }
...@@ -152,6 +152,7 @@ namespace Edu.Module.StudyAbroad ...@@ -152,6 +152,7 @@ namespace Edu.Module.StudyAbroad
{ nameof(RB_StudyAbroad_ViewModel.Remark),model.Remark}, { nameof(RB_StudyAbroad_ViewModel.Remark),model.Remark},
{ nameof(RB_StudyAbroad_ViewModel.School_Id),model.School_Id}, { nameof(RB_StudyAbroad_ViewModel.School_Id),model.School_Id},
{ nameof(RB_StudyAbroad_ViewModel.ImgCover),model.ImgCover}, { nameof(RB_StudyAbroad_ViewModel.ImgCover),model.ImgCover},
{ nameof(RB_StudyAbroad_ViewModel.ProductType),model.ProductType},
}; };
flag = studyAbroadRepository.Update(fileds, new WhereHelper(nameof(RB_StudyAbroad_ViewModel.Id), model.Id)); flag = studyAbroadRepository.Update(fileds, new WhereHelper(nameof(RB_StudyAbroad_ViewModel.Id), model.Id));
} }
......
using Edu.Cache.User; using Edu.Cache.User;
using Edu.Common.API; using Edu.Common.API;
using Edu.Common.Enum.Sale; using Edu.Common.Enum.Sale;
using Edu.Common.Enum.StudyAbroad;
using Edu.Common.Plugin; using Edu.Common.Plugin;
using Edu.Model.ViewModel.StudyAbroad; using Edu.Model.ViewModel.StudyAbroad;
using Edu.Module.StudyAbroad; using Edu.Module.StudyAbroad;
...@@ -198,6 +199,12 @@ namespace Edu.WebApi.Controllers.StudyAbroad ...@@ -198,6 +199,12 @@ namespace Edu.WebApi.Controllers.StudyAbroad
#endregion #endregion
#region 留学就业管理 #region 留学就业管理
[HttpPost]
public ApiResult GetProductTypeList()
{
var list = Common.Plugin.EnumHelper.EnumToList(typeof(StudyAbroadProductTypeEnum));
return ApiResult.Success(data: list);
}
/// <summary> /// <summary>
/// 获取留学就业分页列表 /// 获取留学就业分页列表
...@@ -270,6 +277,8 @@ namespace Edu.WebApi.Controllers.StudyAbroad ...@@ -270,6 +277,8 @@ namespace Edu.WebApi.Controllers.StudyAbroad
ManagerAuditTime = Common.ConvertHelper.FormatTime(item.ManagerAuditTime), ManagerAuditTime = Common.ConvertHelper.FormatTime(item.ManagerAuditTime),
item.ImgCover, item.ImgCover,
item.Status, item.Status,
item.ProductType,
ProductTypeName=item.ProductType.ToName(),
}); });
} }
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
...@@ -409,6 +418,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad ...@@ -409,6 +418,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
Group_Id = this.UserInfo.Group_Id, Group_Id = this.UserInfo.Group_Id,
School_Id = base.ParmJObj.GetInt("School_Id"), School_Id = base.ParmJObj.GetInt("School_Id"),
ImgCover=base.ParmJObj.GetStringValue("ImgCover"), ImgCover=base.ParmJObj.GetStringValue("ImgCover"),
ProductType=(StudyAbroadProductTypeEnum)base.ParmJObj.GetInt("ProductType"),
}; };
extModel.SaleState =Common.Enum.Sale.SaleStateEnum.NoPerfect; extModel.SaleState =Common.Enum.Sale.SaleStateEnum.NoPerfect;
bool flag = studyAbroadModule.SetStudyAbroadModule(extModel); bool flag = studyAbroadModule.SetStudyAbroadModule(extModel);
...@@ -499,6 +509,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad ...@@ -499,6 +509,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
ManagerName = UserReidsCache.GetUserLoginInfo(extModel.ManagerId)?.AccountName ?? "", ManagerName = UserReidsCache.GetUserLoginInfo(extModel.ManagerId)?.AccountName ?? "",
extModel.PreferentialList, extModel.PreferentialList,
extModel.ImgCover, extModel.ImgCover,
extModel.ProductType,
}; };
return ApiResult.Success(data: obj); return ApiResult.Success(data: obj);
} }
......
{ {
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ", "DefaultConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient", "DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ", "FinanceConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient", "FinanceConnectionPName": "MySql.Data.MySqlClient",
"DataStatisticsConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ", "DataStatisticsConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DataStatisticsConnectionPName": "MySql.Data.MySqlClient", "DataStatisticsConnectionPName": "MySql.Data.MySqlClient",
"LogConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ", "LogConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"LogConnectionPName": "MySql.Data.MySqlClient", "LogConnectionPName": "MySql.Data.MySqlClient",
"MallConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ", "MallConnection": "server=192.168.10.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"MallConnectionPName": "MySql.Data.MySqlClient" "MallConnectionPName": "MySql.Data.MySqlClient"
}, },
"Logging": { "Logging": {
......
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