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
5dadfe34
Commit
5dadfe34
authored
Sep 14, 2024
by
位宇华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
--代码提交
parent
5bc36f76
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
5 deletions
+0
-5
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/SalaryCurrentRuleServiceImpl.java
...oyi/system/service/impl/SalaryCurrentRuleServiceImpl.java
+0
-5
No files found.
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/SalaryCurrentRuleServiceImpl.java
View file @
5dadfe34
...
...
@@ -48,25 +48,20 @@ public class SalaryCurrentRuleServiceImpl implements SalaryCurrentRuleService {
salary
.
setSourceExpenses
(
source
.
getExpenseSource
());
}
}));
// System.err.println(JSON.toJSONString(salaryExcelModels));
int
count
=
salaryMapper
.
exist
(
mineCode
,
salaryDate
);
if
(
count
>
0
)
{
//salaryMapper.delete(salaryDate, mineCode);
List
<
String
>
stringList
=
salaryMapper
.
selectByDateAndMineCode
(
salaryDate
,
mineCode
);
if
(!
CollectionUtils
.
isEmpty
(
stringList
))
{
List
<
SalaryExcelModel
>
includeCollect
=
salaryExcelModels
.
stream
().
filter
(
value
->
stringList
.
contains
(
value
.
getOrg
())).
collect
(
Collectors
.
toList
());
if
(!
CollectionUtils
.
isEmpty
(
includeCollect
))
{
System
.
err
.
println
(
JSON
.
toJSONString
(
includeCollect
));
includeCollect
.
forEach
(
salaryMapper:
:
updateByDateAndProject
);
}
List
<
SalaryExcelModel
>
noIncludeCollect
=
salaryExcelModels
.
stream
().
filter
(
value
->
!
stringList
.
contains
(
value
.
getOrg
())).
collect
(
Collectors
.
toList
());
System
.
err
.
println
(
JSON
.
toJSONString
(
noIncludeCollect
));
if
(!
CollectionUtils
.
isEmpty
(
noIncludeCollect
))
{
salaryMapper
.
save
(
noIncludeCollect
);
}
}
}
else
{
System
.
err
.
println
(
JSON
.
toJSONString
(
salaryExcelModels
));
salaryMapper
.
save
(
salaryExcelModels
);
}
});
...
...
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