Commit 19c94ee6 authored by 黄奎's avatar 黄奎

页面修改

parent 3d529c43
...@@ -45,7 +45,7 @@ namespace Edu.Module.User ...@@ -45,7 +45,7 @@ namespace Edu.Module.User
/// </summary> /// </summary>
/// <param name="GId"></param> /// <param name="GId"></param>
/// <returns></returns> /// <returns></returns>
public RB_School_ViewModel GetGroupEntityModule(int SId) public RB_School_ViewModel GetSchoolEntityModule(int SId)
{ {
return GetSchoolListModule(new RB_School_ViewModel() { SId = SId })?.FirstOrDefault() ?? new RB_School_ViewModel(); return GetSchoolListModule(new RB_School_ViewModel() { SId = SId })?.FirstOrDefault() ?? new RB_School_ViewModel();
} }
...@@ -107,7 +107,7 @@ namespace Edu.Module.User ...@@ -107,7 +107,7 @@ namespace Edu.Module.User
/// </summary> /// </summary>
/// <param name="SId">学校编号</param> /// <param name="SId">学校编号</param>
/// <returns></returns> /// <returns></returns>
public virtual bool RemoveGroupModule(object SId) public virtual bool RemoveSchoolModule(object SId)
{ {
bool flag; bool flag;
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
......
...@@ -3,6 +3,7 @@ using System.Collections.Generic; ...@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Edu.Common.API; using Edu.Common.API;
using Edu.Common.Plugin;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
using Edu.Module.User; using Edu.Module.User;
using Edu.WebApi.Filter; using Edu.WebApi.Filter;
...@@ -10,6 +11,7 @@ using Microsoft.AspNetCore.Authorization; ...@@ -10,6 +11,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
namespace Edu.WebApi.Controllers.User namespace Edu.WebApi.Controllers.User
{ {
...@@ -74,7 +76,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -74,7 +76,7 @@ namespace Edu.WebApi.Controllers.User
{ {
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString()); var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Group_ViewModel>(RequestParm.Msg.ToString()); var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Group_ViewModel>(RequestParm.Msg.ToString());
var list = groupModule.GetGroupPageListModule(pageModel.PageIndex,pageModel.PageSize,out long rowsCount,query); var list = groupModule.GetGroupPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
pageModel.PageData = list; pageModel.PageData = list;
return ApiResult.Success(data: list); return ApiResult.Success(data: list);
...@@ -86,7 +88,102 @@ namespace Edu.WebApi.Controllers.User ...@@ -86,7 +88,102 @@ namespace Edu.WebApi.Controllers.User
/// <returns></returns> /// <returns></returns>
public ApiResult SetGroup() public ApiResult SetGroup()
{ {
return ApiResult.Failed(); var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_Group_ViewModel>(RequestParm.Msg.ToString());
extModel.CreateBy = 0;
extModel.CreateTime = DateTime.Now;
extModel.UpdateBy = 0;
extModel.UpdateTime = DateTime.Now;
bool flag = groupModule.SetGroupModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
} }
/// <summary>
/// 获取集团列表
/// </summary>
/// <returns></returns>
public ApiResult GetGroup()
{
JObject jobj = JObject.Parse(RequestParm.Msg.ToString());
var GId = jobj.GetInt("GId", 0);
var extModel = groupModule.GetGroupEntityModule(GId);
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 删除集团
/// </summary>
/// <returns></returns>
public ApiResult RemoveGroup()
{
JObject jobj = JObject.Parse(RequestParm.Msg.ToString());
var GId = jobj.GetInt("GId", 0);
var flag = groupModule.RemoveGroupModule(GId);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取学校列表
/// </summary>
/// <returns></returns>
public ApiResult GetSchoolList()
{
var query = Common.Plugin.JsonHelper.DeserializeObject<RB_School_ViewModel>(RequestParm.Msg.ToString());
var list = schoolModule.GetSchoolListModule(query);
return ApiResult.Success(data: list);
}
/// <summary>
/// 获取学校分页列表
/// </summary>
/// <returns></returns>
public ApiResult GetSchoolPageList()
{
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = Common.Plugin.JsonHelper.DeserializeObject<RB_School_ViewModel>(RequestParm.Msg.ToString());
var list = schoolModule.GetSchoolPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
pageModel.Count = rowsCount;
pageModel.PageData = list;
return ApiResult.Success(data: list);
}
/// <summary>
/// 添加修改学校
/// </summary>
/// <returns></returns>
public ApiResult SetSchool()
{
var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_School_ViewModel>(RequestParm.Msg.ToString());
extModel.CreateBy = 0;
extModel.CreateTime = DateTime.Now;
extModel.UpdateBy = 0;
extModel.UpdateTime = DateTime.Now;
bool flag = schoolModule.SetSchoolModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取学校实体
/// </summary>
/// <returns></returns>
public ApiResult GetSchool()
{
JObject jobj = JObject.Parse(RequestParm.Msg.ToString());
var SId = jobj.GetInt("SId", 0);
var extModel = schoolModule.GetSchoolEntityModule(SId);
return ApiResult.Success(data: extModel);
}
/// <summary>
/// 删除学校
/// </summary>
/// <returns></returns>
public ApiResult RemoveSchool()
{
JObject jobj = JObject.Parse(RequestParm.Msg.ToString());
var SId = jobj.GetInt("SId", 0);
var flag = schoolModule.RemoveSchoolModule(SId);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
} }
} }
\ No newline at end of file
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