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
ed0b20dd
Commit
ed0b20dd
authored
Aug 16, 2023
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
汇总bug修改
parent
b8028932
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAllRecordController.java
...ortals/xhx/module/check/web/CheckAllRecordController.java
+11
-7
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAllRecordController.java
View file @
ed0b20dd
...
...
@@ -138,8 +138,8 @@ public class CheckAllRecordController extends BaseJsonBodyController {
CheckAllScoreSummaryVo
current
=
checkAllRecordService
.
getScoreSummary
(
query
);
NumberFormat
numberFormat
=
NumberFormat
.
getPercentInstance
();
numberFormat
.
setMaximumFractionDigits
(
2
);
BigDecimal
zero
=
new
BigDecimal
(
0
);
if
(
current
!=
null
)
{
BigDecimal
zero
=
new
BigDecimal
(
0
);
model
.
put
(
"initScore"
,
current
.
getInitScore
());
model
.
put
(
"checkScore"
,
current
.
getCheckScore
());
model
.
put
(
"appealScore"
,
current
.
getAppealScore
());
...
...
@@ -153,9 +153,11 @@ public class CheckAllRecordController extends BaseJsonBodyController {
CheckAllScoreSummaryVo
last
=
checkAllRecordService
.
getScoreSummary
(
lastQuery
);
if
(
last
!=
null
)
{
BigDecimal
huanbi
=
current
.
getTotal
().
subtract
(
last
.
getTotal
());
huanbi
=
huanbi
.
divide
(
last
.
getTotal
(),
6
,
BigDecimal
.
ROUND_HALF_UP
);
model
.
put
(
"huanbi"
,
numberFormat
.
format
(
huanbi
));
if
(
last
.
getTotal
().
compareTo
(
zero
)>
0
)
{
BigDecimal
huanbi
=
current
.
getTotal
().
subtract
(
last
.
getTotal
());
huanbi
=
huanbi
.
divide
(
last
.
getTotal
(),
6
,
BigDecimal
.
ROUND_HALF_UP
);
model
.
put
(
"huanbi"
,
numberFormat
.
format
(
huanbi
));
}
}
if
(
query
.
getSummaryType
()
==
SummaryTopTypeEnum
.
年
.
getValue
())
{
if
(
last
!=
null
)
{
...
...
@@ -177,9 +179,11 @@ public class CheckAllRecordController extends BaseJsonBodyController {
}
CheckAllScoreSummaryVo
tb
=
checkAllRecordService
.
getScoreSummary
(
lastQuery
);
if
(
tb
!=
null
)
{
BigDecimal
tongbi
=
current
.
getTotal
().
subtract
(
tb
.
getTotal
());
tongbi
=
tongbi
.
divide
(
last
.
getTotal
(),
6
,
BigDecimal
.
ROUND_HALF_UP
);
model
.
put
(
"tongbi"
,
numberFormat
.
format
(
tongbi
));
if
(
last
.
getTotal
().
compareTo
(
zero
)>
0
)
{
BigDecimal
tongbi
=
current
.
getTotal
().
subtract
(
tb
.
getTotal
());
tongbi
=
tongbi
.
divide
(
last
.
getTotal
(),
6
,
BigDecimal
.
ROUND_HALF_UP
);
model
.
put
(
"tongbi"
,
numberFormat
.
format
(
tongbi
));
}
}
}
}
...
...
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