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
a3ebadf6
Commit
a3ebadf6
authored
Mar 19, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
f017b2fb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
5 deletions
+51
-5
Config.cs
Edu.Common/Config.cs
+24
-0
RB_StudyAbroadRepository.cs
Edu.Repository/StudyAbroad/RB_StudyAbroadRepository.cs
+0
-2
StudyAbroadController.cs
Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs
+22
-2
appsettings.json
Edu.WebApi/appsettings.json
+5
-1
No files found.
Edu.Common/Config.cs
View file @
a3ebadf6
...
@@ -389,5 +389,29 @@ namespace Edu.Common
...
@@ -389,5 +389,29 @@ namespace Edu.Common
return
"@"
;
return
"@"
;
}
}
}
}
/// <summary>
/// 留学就业部门主管审核编号
/// </summary>
public
static
int
StudyAbroadDirectorId
{
get
{
int
.
TryParse
(
ReadConfigKey
(
"StudyAbroadDirectorId"
),
out
int
studyAbroadDirectorId
);
return
studyAbroadDirectorId
;
}
}
/// <summary>
/// 留学就业部门负责人审核编号
/// </summary>
public
static
int
StudyAbroadManagerId
{
get
{
int
.
TryParse
(
ReadConfigKey
(
"StudyAbroadManagerId"
),
out
int
studyAbroadManagerId
);
return
studyAbroadManagerId
;
}
}
}
}
}
}
\ No newline at end of file
Edu.Repository/StudyAbroad/RB_StudyAbroadRepository.cs
View file @
a3ebadf6
...
@@ -52,7 +52,6 @@ WHERE 1=1
...
@@ -52,7 +52,6 @@ WHERE 1=1
{
{
builder
.
AppendFormat
(
" AND A.{0}={1}"
,
nameof
(
RB_StudyAbroad_ViewModel
.
Type
),
query
.
Type
);
builder
.
AppendFormat
(
" AND A.{0}={1}"
,
nameof
(
RB_StudyAbroad_ViewModel
.
Type
),
query
.
Type
);
}
}
if
(
query
.
AuditType
==
1
)
if
(
query
.
AuditType
==
1
)
{
{
builder
.
AppendFormat
(
" AND A.SaleState=2 AND A.DirectorStatus=0 "
);
builder
.
AppendFormat
(
" AND A.SaleState=2 AND A.DirectorStatus=0 "
);
...
@@ -61,7 +60,6 @@ WHERE 1=1
...
@@ -61,7 +60,6 @@ WHERE 1=1
{
{
builder
.
AppendFormat
(
" AND A.SaleState=2 AND A.DirectorId>0 AND A.DirectorStatus=1 AND A.ManagerStatus=0 "
);
builder
.
AppendFormat
(
" AND A.SaleState=2 AND A.DirectorId>0 AND A.DirectorStatus=1 AND A.ManagerStatus=0 "
);
}
}
return
GetPage
<
RB_StudyAbroad_ViewModel
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
(),
parameters
).
ToList
();
return
GetPage
<
RB_StudyAbroad_ViewModel
>(
pageIndex
,
pageSize
,
out
rowsCount
,
builder
.
ToString
(),
parameters
).
ToList
();
}
}
}
}
...
...
Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs
View file @
a3ebadf6
...
@@ -302,7 +302,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
...
@@ -302,7 +302,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"
),
};
};
extModel
.
SaleState
=
0
;
extModel
.
SaleState
=
Common
.
Enum
.
Sale
.
SaleStateEnum
.
NoPerfect
;
bool
flag
=
studyAbroadModule
.
SetStudyAbroadModule
(
extModel
);
bool
flag
=
studyAbroadModule
.
SetStudyAbroadModule
(
extModel
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
}
...
@@ -409,7 +409,6 @@ namespace Edu.WebApi.Controllers.StudyAbroad
...
@@ -409,7 +409,6 @@ namespace Edu.WebApi.Controllers.StudyAbroad
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
}
/// <summary>
/// <summary>
/// 部门负责人审核
/// 部门负责人审核
/// </summary>
/// </summary>
...
@@ -427,6 +426,27 @@ namespace Edu.WebApi.Controllers.StudyAbroad
...
@@ -427,6 +426,27 @@ namespace Edu.WebApi.Controllers.StudyAbroad
var
flag
=
studyAbroadModule
.
SetManagerAuditModule
(
extModel
,
base
.
UserInfo
);
var
flag
=
studyAbroadModule
.
SetManagerAuditModule
(
extModel
,
base
.
UserInfo
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
}
/// <summary>
/// 获取留学就业审核人信息
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetStudyAbroadAudit
()
{
List
<
object
>
list
=
new
List
<
object
>();
list
.
Add
(
new
{
Id
=
Common
.
Config
.
StudyAbroadDirectorId
,
Name
=
"部门主管审核"
});
list
.
Add
(
new
{
Id
=
Common
.
Config
.
StudyAbroadManagerId
,
Name
=
"部门负责人审核"
});
return
ApiResult
.
Success
(
data
:
list
);
}
#
endregion
#
endregion
}
}
}
}
Edu.WebApi/appsettings.json
View file @
a3ebadf6
...
@@ -48,5 +48,9 @@
...
@@ -48,5 +48,9 @@
//分区校长岗位编号
//分区校长岗位编号
"SchoolPostId"
:
3
,
"SchoolPostId"
:
3
,
//教务长
//教务长
"JiaoWuZhang"
:
8
"JiaoWuZhang"
:
8
,
//留学就业部门主管审核编号
[
王涛
]
"StudyAbroadDirectorId"
:
64
,
//留学就业部门负责人审核编号
[
姚顺先
]
"StudyAbroadManagerId"
:
52
}
}
\ 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