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
93021197
Commit
93021197
authored
4 years ago
by
tangzhaoqian
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
审批+绩效
parent
20faab7b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
src/main/java/cn/timer/api/controller/jxgl/JxglController.java
+3
-0
src/main/java/cn/timer/api/utils/router/RouterUtils.java
+2
-2
No files found.
src/main/java/cn/timer/api/controller/jxgl/JxglController.java
View file @
93021197
...
...
@@ -726,6 +726,8 @@ public class JxglController {
@PutMapping
(
value
=
"/termination_performance_appraisal"
)
@ApiOperation
(
value
=
"8.终止-绩效考核"
,
httpMethod
=
"PUT"
,
notes
=
"终止-绩效考核"
)
@ApiOperationSupport
(
order
=
8
)
@Role
@Log
(
title
=
"终止-绩效考核"
)
public
Result
<
Object
>
terminationPA
(
@CurrentUser
UserBean
userBean
,
@NotNull
@RequestParam
Integer
id
)
{
JxglPerformanceAppraisal
performanceAppraisal
=
jxglPerformanceAppraisalMapper
...
...
@@ -955,6 +957,7 @@ public class JxglController {
@ApiOperation
(
value
=
"13.终止-考核"
,
httpMethod
=
"PUT"
,
notes
=
"终止-考核"
)
@ApiOperationSupport
(
order
=
13
)
@Role
@Log
(
title
=
"终止-考核"
)
public
Result
<
Object
>
terminationAssessment
(
@CurrentUser
UserBean
userBean
,
@NotNull
@RequestParam
Integer
id
)
{
JxglAppraisal
appraisal
=
jxglAppraisalMapper
.
selectById
(
id
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/utils/router/RouterUtils.java
View file @
93021197
...
...
@@ -118,14 +118,14 @@ public class RouterUtils {
router
.
setFlow
(
true
);
List
<
User
>
listUser
=
router
.
getRelation
().
get
(
0
).
getUsers
();
user:
user:
for
(
int
i
=
0
;
i
<
listUser
.
size
();
i
++)
{
String
execute
=
listUser
.
get
(
i
).
getExecute
();
switch
(
execute
)
{
case
UNEXECUTED:
listUser
.
get
(
i
).
setExecute
(
EXECUTING
);
// 首次发起申请时,写入 审批人名称 至 obj 中
if
(
isFirse
)
{
if
(
isFirse
&&
obj
.
getStr
(
"current_approver"
)
!=
null
)
{
obj
.
set
(
"current_approver"
,
listUser
.
get
(
i
).
getName
());
}
...
...
This diff is collapsed.
Click to expand it.
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