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
c167dc18
Commit
c167dc18
authored
Nov 28, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
a7f740a2
23618238
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
6 deletions
+0
-6
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+0
-3
TStatisticsBonusServiceImpl.java
...yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
+0
-3
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
c167dc18
...
...
@@ -893,9 +893,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
insert
.
setOldContractId
(
contractInfo
.
getId
());
insert
.
setContractName
(
contractInfo
.
getContractName
());
insert
.
setContractSubName
(
contractInfo
.
getContractSubName
());
if
(!
EmployeeConstants
.
SITUATION_SEVEN
.
equals
(
insert
.
getSituation
()))
{
insert
.
setReason
(
contractInfo
.
getReason
());
}
insert
.
setSubjectUnit
(
contractInfo
.
getSubjectUnit
());
insert
.
setContractParty
(
contractInfo
.
getContractParty
());
insert
.
setContractType
(
contractInfo
.
getContractType
());
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
View file @
c167dc18
...
...
@@ -183,8 +183,6 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
BigDecimal
isTax
;
//减除费用
BigDecimal
costReduction
;
//年终奖上限
BigDecimal
maxAnualSalary
;
//年终奖单独扣税12月税费
BigDecimal
finalSalaryNoSalary
;
//年终奖合并扣税12月税费
...
...
@@ -238,7 +236,6 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
//薪资扣税合计
sumTax
=
BigDecimal
.
ZERO
;
minSalary
=
BigDecimal
.
ZERO
;
maxAnualSalary
=
BigDecimal
.
ZERO
;
costReduction
=
BigDecimal
.
ZERO
;
isTax
=
BigDecimal
.
ZERO
;
twlSalaryTax
=
BigDecimal
.
ZERO
;
...
...
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