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
8b34bbc6
Commit
8b34bbc6
authored
Apr 07, 2024
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
考勤汇总分数bug修改
parent
03fa9e91
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/common/utils/StaffPerformUtil.java
...n/java/com/mortals/xhx/common/utils/StaffPerformUtil.java
+3
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffPerformSummaryController.java
...s/xhx/module/staff/web/StaffPerformSummaryController.java
+2
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/common/utils/StaffPerformUtil.java
View file @
8b34bbc6
...
@@ -34,6 +34,9 @@ public class StaffPerformUtil {
...
@@ -34,6 +34,9 @@ public class StaffPerformUtil {
BigDecimal
effectScore
=
total
.
add
(
staffPerformSummaryEntity
.
getEffectScore
());
//效能
BigDecimal
effectScore
=
total
.
add
(
staffPerformSummaryEntity
.
getEffectScore
());
//效能
effectScore
=
effectScore
.
multiply
(
weightPdu
.
effectWeight
());
effectScore
=
effectScore
.
multiply
(
weightPdu
.
effectWeight
());
BigDecimal
complainScore
=
staffPerformSummaryEntity
.
getComplainScore
();
//自评不用加100
BigDecimal
complainScore
=
staffPerformSummaryEntity
.
getComplainScore
();
//自评不用加100
if
(
complainScore
.
compareTo
(
BigDecimal
.
ZERO
)==
0
){
complainScore
=
SCORE100
;
}
complainScore
=
complainScore
.
multiply
(
weightPdu
.
selfWeight
());
complainScore
=
complainScore
.
multiply
(
weightPdu
.
selfWeight
());
BigDecimal
summary
=
new
BigDecimal
(
0
);
BigDecimal
summary
=
new
BigDecimal
(
0
);
if
(
staffEntity
.
getReviewCheck
()==
1
)
{
if
(
staffEntity
.
getReviewCheck
()==
1
)
{
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffPerformSummaryController.java
View file @
8b34bbc6
...
@@ -10,6 +10,7 @@ import com.mortals.framework.util.DateUtils;
...
@@ -10,6 +10,7 @@ import com.mortals.framework.util.DateUtils;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.common.pdu.WeightPdu
;
import
com.mortals.xhx.common.pdu.WeightPdu
;
import
com.mortals.xhx.common.utils.StaffPerformUtil
;
import
com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery
;
import
com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery
;
import
com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery
;
import
com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
...
@@ -131,7 +132,7 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro
...
@@ -131,7 +132,7 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro
staffPerformSummaryEntity
.
setEffectScore
(
BigDecimal
.
ZERO
);
staffPerformSummaryEntity
.
setEffectScore
(
BigDecimal
.
ZERO
);
staffPerformSummaryEntity
.
setComplainScore
(
BigDecimal
.
ZERO
);
staffPerformSummaryEntity
.
setComplainScore
(
BigDecimal
.
ZERO
);
staffPerformSummaryEntity
.
setAttendScore
(
BigDecimal
.
ZERO
);
staffPerformSummaryEntity
.
setAttendScore
(
BigDecimal
.
ZERO
);
staffPerformSummaryEntity
.
setTotalScore
(
BigDecimal
.
ZERO
);
staffPerformSummaryEntity
.
setTotalScore
(
StaffPerformUtil
.
SCORE100
);
staffPerformSummaryEntity
.
setErrorScore
(
BigDecimal
.
ZERO
);
staffPerformSummaryEntity
.
setErrorScore
(
BigDecimal
.
ZERO
);
Map
<
String
,
Object
>
condition
=
new
HashMap
<>();
Map
<
String
,
Object
>
condition
=
new
HashMap
<>();
condition
.
put
(
"year"
,
year
);
condition
.
put
(
"year"
,
year
);
...
...
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