Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
e323b98c
Commit
e323b98c
authored
Jul 18, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改考勤汇总
parent
75b6fd77
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
2 deletions
+24
-2
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java
...va/com/mortals/xhx/busiz/h5/web/PerformApiController.java
+24
-2
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java
View file @
e323b98c
...
@@ -404,7 +404,29 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
...
@@ -404,7 +404,29 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
throw
new
AppException
(
"不支持当前绩效类型"
);
throw
new
AppException
(
"不支持当前绩效类型"
);
}
}
PerformAttendAppealEntity
appealEntity
=
appealService
.
selectOne
(
new
PerformAttendAppealQuery
().
checkRecordId
(
performDetailInfo
.
getId
()));
PerformAttendAppealEntity
entity
=
appealService
.
selectOne
(
new
PerformAttendAppealQuery
().
checkRecordId
(
performDetailInfo
.
getId
()));
// updateAppealResult(performInfo, entity);
if
(!
ObjectUtils
.
isEmpty
(
entity
))
{
Boolean
bool
=
entity
.
newEntity
();
if
(
bool
)
{
performDetailInfo
.
setAppealStatus
(
AppealStatusEnum
.
未申诉
.
getValue
());
}
else
{
if
(
AppealResultEnum
.
通过
.
getValue
()
==
entity
.
getAppealResult
())
{
performDetailInfo
.
setAppealStatus
(
AppealStatusEnum
.
申诉通过
.
getValue
());
}
else
if
(
AppealResultEnum
.
不通过
.
getValue
()
==
entity
.
getAppealResult
())
{
performDetailInfo
.
setAppealStatus
(
AppealStatusEnum
.
申诉拒绝
.
getValue
());
}
else
{
performDetailInfo
.
setAppealStatus
(
AppealStatusEnum
.
申诉中
.
getValue
());
}
}
}
else
{
performDetailInfo
.
setAppealStatus
(
AppealStatusEnum
.
未申诉
.
getValue
());
}
/*
if (ObjectUtils.isEmpty(appealEntity)) {
if (ObjectUtils.isEmpty(appealEntity)) {
performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
} else {
} else {
...
@@ -417,7 +439,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
...
@@ -417,7 +439,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
performDetailInfo.setAppealStatus(AppealStatusEnum.申诉拒绝.getValue());
performDetailInfo.setAppealStatus(AppealStatusEnum.申诉拒绝.getValue());
}
}
}
}
}
}
*/
PerformRulesEntity
rulesEntity
=
rulesService
.
getCache
(
performDetailInfo
.
getRuleId
().
toString
());
PerformRulesEntity
rulesEntity
=
rulesService
.
getCache
(
performDetailInfo
.
getRuleId
().
toString
());
...
...
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