Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
K
klck
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
位宇华
klck
Commits
deff2ec5
Commit
deff2ec5
authored
6 months ago
by
位宇华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
中浩工资--代码提交
parent
26c6ab0e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
ruoyi-wages/src/main/java/com/ruoyi/system/support/CurrentRuleSalarySupport.java
...va/com/ruoyi/system/support/CurrentRuleSalarySupport.java
+2
-2
No files found.
ruoyi-wages/src/main/java/com/ruoyi/system/support/CurrentRuleSalarySupport.java
View file @
deff2ec5
...
...
@@ -57,9 +57,9 @@ public class CurrentRuleSalarySupport {
String
mineCode
=
newRuleRequestModelList
.
get
(
0
).
getMineid
();
ReplaceSpace
(
newRuleRequestModelList
);
List
<
SalaryExpenseSourceModel
>
sourceModels
=
salaryMapper
.
getSources
(
mineCode
);
newRuleRequestModelList
=
newRuleRequestModelList
.
stream
().
filter
(
v
->
sourceModels
.
stream
().
anyMatch
(
source
->
StringUtils
.
equals
(
v
.
getRow
(),
source
.
getOrg
()))).
collect
(
Collectors
.
toList
());
newRuleRequestModelList
=
newRuleRequestModelList
.
stream
().
filter
(
v
->
sourceModels
.
stream
().
anyMatch
(
source
->
StringUtils
.
equals
(
v
.
getRow
(),
source
.
getOrg
()))).
collect
(
Collectors
.
toList
());
List
<
SalaryExcelModel
>
salaryExcelModelList
=
getSalaryMapping
(
newRuleRequestModelList
);
salaryExcelModelList
.
forEach
(
v
->
v
.
setSumSalary
(
new
BigDecimal
(
v
.
getSumSalary
()).
toPlainString
()));
salaryExcelModelList
.
forEach
(
v
->
v
.
setSumSalary
(
new
BigDecimal
(
v
.
getSumSalary
()).
toPlainString
()));
return
salaryExcelModelList
;
}
...
...
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