Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
5d8e0f09
Commit
5d8e0f09
authored
Jun 12, 2020
by
Administrator
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tzq' into 'develop'
权限 See merge request 8timerv2/8timerapiv200!182
parents
16fd20ad
c29dd8ad
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
src/main/java/cn/timer/api/controller/jxgl/JxglController.java
+0
-4
No files found.
src/main/java/cn/timer/api/controller/jxgl/JxglController.java
View file @
5d8e0f09
...
...
@@ -210,7 +210,6 @@ public class JxglController {
@GetMapping
(
value
=
"/select_basic_setting"
)
@ApiOperation
(
value
=
"2.查询-基础设置"
,
httpMethod
=
"GET"
,
notes
=
"查询-基础设置"
)
@ApiOperationSupport
(
order
=
2
)
@Role
public
Result
<
Object
>
selectAT
(
@CurrentUser
UserBean
userBean
)
{
JxglBasicSetting
bS
=
jxglService
.
selectAT
(
userBean
.
getOrgCode
());
...
...
@@ -291,7 +290,6 @@ public class JxglController {
@PostMapping
(
value
=
"/selects_appraisal_t"
)
@ApiOperation
(
value
=
"4.查询-考核模板-列表"
,
httpMethod
=
"POST"
,
notes
=
"查询-考核模板-列表"
)
@ApiOperationSupport
(
order
=
4
)
@Role
public
Result
<
Object
>
selectListAT
(
@CurrentUser
UserBean
userBean
,
@RequestBody
cn
.
timer
.
api
.
utils
.
Page
page
)
{
IPage
<
JxglAppraisalT
>
p
=
new
Page
<
JxglAppraisalT
>(
page
.
getCurrentPage
(),
page
.
getTotalPage
());
...
...
@@ -1843,7 +1841,6 @@ public class JxglController {
@PostMapping
(
value
=
"/selects_my_emp_performance"
)
@ApiOperation
(
value
=
"25.查询-我的绩效-员工绩效"
,
httpMethod
=
"POST"
,
notes
=
"查询-我的绩效-员工绩效"
)
@ApiOperationSupport
(
order
=
25
)
@Role
@Log
(
title
=
"绩效管理-查询-我的绩效-员工绩效"
)
public
Result
<
Object
>
selectsMEP
(
@CurrentUser
UserBean
userBean
,
@RequestBody
EmpPerformanceQuery
query
)
{
Integer
orgCode
=
userBean
.
getOrgCode
();
...
...
@@ -1889,5 +1886,4 @@ public class JxglController {
return
ResultUtil
.
data
(
pageA
,
listA
);
}
}
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