Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
Education
Commits
19c94ee6
Commit
19c94ee6
authored
Sep 18, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
3d529c43
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
101 additions
and
4 deletions
+101
-4
SchoolModule.cs
Edu.Module.User/SchoolModule.cs
+2
-2
UserController.cs
Edu.WebApi/Controllers/User/UserController.cs
+99
-2
No files found.
Edu.Module.User/SchoolModule.cs
View file @
19c94ee6
...
@@ -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
Get
Group
EntityModule
(
int
SId
)
public
RB_School_ViewModel
Get
School
EntityModule
(
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
Remove
Group
Module
(
object
SId
)
public
virtual
bool
Remove
School
Module
(
object
SId
)
{
{
bool
flag
;
bool
flag
;
Dictionary
<
string
,
object
>
fileds
=
new
Dictionary
<
string
,
object
>()
Dictionary
<
string
,
object
>
fileds
=
new
Dictionary
<
string
,
object
>()
...
...
Edu.WebApi/Controllers/User/UserController.cs
View file @
19c94ee6
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment