Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
91f3dfd9
Commit
91f3dfd9
authored
Dec 28, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
年终奖修改
parent
b1f11757
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
TStatisticsBonusServiceImpl.java
...yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
+2
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
View file @
91f3dfd9
...
...
@@ -59,6 +59,7 @@ import java.io.IOException;
import
java.math.BigDecimal
;
import
java.math.RoundingMode
;
import
java.net.URLEncoder
;
import
java.time.LocalDateTime
;
import
java.util.*
;
import
java.util.stream.Collectors
;
...
...
@@ -320,7 +321,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
//专项扣除从专项扣除表中直接获取
specialDeducation
=
deducationSumService
.
getOne
(
Wrappers
.<
TSpecialDeducationSum
>
query
().
lambda
()
.
eq
(
TSpecialDeducationSum:
:
getIdNumber
,
infoVo
.
getEmpIdcard
())
.
eq
(
TSpecialDeducationSum:
:
getCreateMonth
,
DateUtil
.
getYear
(
DateUtil
.
getCurrentDateTime
())
+
"12"
)
.
eq
(
TSpecialDeducationSum:
:
getCreateMonth
,
DateUtil
.
getYear
AndMonth
(
LocalDateTime
.
now
(),
0
)
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
specialDeducation
))
{
sdSum
=
BigDecimalUtils
.
safeAdd
(
specialDeducation
.
getSumChildEduMoney
()
...
...
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