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
6df9ea81
Commit
6df9ea81
authored
May 18, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.5.4-SALARY实发倒推应发初次提交
parent
b97f90bd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
17 deletions
+10
-17
EkpSalaryParamVo.java
.../com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParamVo.java
+0
-9
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+4
-2
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+6
-6
No files found.
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParamVo.java
View file @
6df9ea81
...
@@ -19,15 +19,6 @@ public class EkpSalaryParamVo extends EkpSalaryParam {
...
@@ -19,15 +19,6 @@ public class EkpSalaryParamVo extends EkpSalaryParam {
* 公积金扣缴月份
* 公积金扣缴月份
**/
**/
private
String
deduProvidentMonth
;
private
String
deduProvidentMonth
;
/**
* 代扣单位社保
**/
private
String
unitSocial
;
/**
* 代扣单位公积金
**/
private
String
unitFund
;
/**
/**
* 代扣社保总额
* 代扣社保总额
**/
**/
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
6df9ea81
...
@@ -1178,6 +1178,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -1178,6 +1178,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
// +累计年金(个人含本期)+累计个人代扣(各类个人代扣费用,含本期)+免个税个人代扣(含本期)】
// +累计年金(个人含本期)+累计个人代扣(各类个人代扣费用,含本期)+免个税个人代扣(含本期)】
// - costReduction - specialDeductionSum
// - costReduction - specialDeductionSum
BigDecimal
relaySalaryHistory
=
SalaryConstants
.
B_ZERO
;
// 历史应发
BigDecimal
relaySalaryHistory
=
SalaryConstants
.
B_ZERO
;
// 历史应发
BigDecimal
taxHistory
=
SalaryConstants
.
B_ZERO
;
// 历史个税
//本次
//本次
for
(
TSalaryAccountItem
item
:
itemList
)
{
for
(
TSalaryAccountItem
item
:
itemList
)
{
if
(
SalaryConstants
.
ANNUAL_BONUS_JAVA
.
equals
(
item
.
getJavaFiedName
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
a
.
getAnnualBonusType
()))
{
if
(
SalaryConstants
.
ANNUAL_BONUS_JAVA
.
equals
(
item
.
getJavaFiedName
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
a
.
getAnnualBonusType
()))
{
...
@@ -1211,6 +1212,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -1211,6 +1212,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
}
}
if
(
SalaryConstants
.
SALARY_TAX_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
if
(
SalaryConstants
.
SALARY_TAX_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
sumTax
=
sumTax
.
add
(
item
.
getSalaryMoney
());
sumTax
=
sumTax
.
add
(
item
.
getSalaryMoney
());
taxHistory
=
taxHistory
.
add
(
item
.
getSalaryMoney
());
}
}
if
(
SalaryConstants
.
RELAY_SALARY_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
if
(
SalaryConstants
.
RELAY_SALARY_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
res
=
res
.
add
(
item
.
getSalaryMoney
());
res
=
res
.
add
(
item
.
getSalaryMoney
());
...
@@ -1273,7 +1275,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -1273,7 +1275,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
&&
areaMoney
.
compareTo
(
sub
.
getMaxIncome
())
<=
SalaryConstants
.
EQUAL
)
{
&&
areaMoney
.
compareTo
(
sub
.
getMaxIncome
())
<=
SalaryConstants
.
EQUAL
)
{
// 3 计算应缴税所得额(参与计税的金额)= (税率档位-速算扣除数)/(1—税率)
// 3 计算应缴税所得额(参与计税的金额)= (税率档位-速算扣除数)/(1—税率)
doTaxMoney
=
(
areaMoney
.
subtract
(
sub
.
getQuickDeducation
())).
divide
(
SalaryConstants
.
B_ONEHUNDRED
.
subtract
(
new
BigDecimal
(
sub
.
getWithholdingRate
())).
divide
(
doTaxMoney
=
(
areaMoney
.
subtract
(
sub
.
getQuickDeducation
())).
divide
(
SalaryConstants
.
B_ONEHUNDRED
.
subtract
(
new
BigDecimal
(
sub
.
getWithholdingRate
())).
divide
(
SalaryConstants
.
B_ONEHUNDRED
,
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
));
SalaryConstants
.
B_ONEHUNDRED
,
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
)
,
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
);
break
;
break
;
}
}
}
}
...
@@ -1299,7 +1301,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -1299,7 +1301,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
if
(
relaySalaryNow
.
compareTo
(
actualSalaryNow
)
<=
SalaryConstants
.
EQUAL
)
{
if
(
relaySalaryNow
.
compareTo
(
actualSalaryNow
)
<=
SalaryConstants
.
EQUAL
)
{
relaySalaryNow
=
actualSalaryNow
;
relaySalaryNow
=
actualSalaryNow
;
}
}
res
=
relaySalaryNow
.
subtract
(
actualSalaryNow
);
res
=
taxAll
.
subtract
(
taxHistory
);
// 本次个人应发合计
// 本次个人应发合计
TSalaryAccountItem
sai
=
new
TSalaryAccountItem
();
TSalaryAccountItem
sai
=
new
TSalaryAccountItem
();
sai
.
setCnName
(
SalaryConstants
.
RELAY_SALARY
);
sai
.
setCnName
(
SalaryConstants
.
RELAY_SALARY
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
6df9ea81
...
@@ -408,15 +408,15 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -408,15 +408,15 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
account
.
setId
(
sendParam
.
getFd_3b10af838eab5c
());
account
.
setId
(
sendParam
.
getFd_3b10af838eab5c
());
// 社保
// 社保
if
((
Common
.
isNotNull
(
sendParam
.
get
UnitSocial
())
if
((
Common
.
isNotNull
(
sendParam
.
get
Fd_3bcd41d857b764
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
sendParam
.
get
UnitSocial
()))
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
sendParam
.
get
Fd_3bcd41d857b764
()))
||(
Common
.
isNotNull
(
sendParam
.
getFd_3b16ce48a9735c
())
||(
Common
.
isNotNull
(
sendParam
.
getFd_3b16ce48a9735c
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
sendParam
.
getFd_3b16ce48a9735c
())))
{
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
sendParam
.
getFd_3b16ce48a9735c
())))
{
doSendForecastSocialToEkp
(
sendParam
,
s
);
doSendForecastSocialToEkp
(
sendParam
,
s
);
}
}
// 公积金
// 公积金
if
((
Common
.
isNotNull
(
sendParam
.
get
UnitFund
())
if
((
Common
.
isNotNull
(
sendParam
.
get
Fd_3bcd41d77e4812
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
sendParam
.
get
UnitFund
()))
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
sendParam
.
get
Fd_3bcd41d77e4812
()))
||
(
Common
.
isNotNull
(
sendParam
.
getFd_3b16ce4b7fc42a
())
||
(
Common
.
isNotNull
(
sendParam
.
getFd_3b16ce4b7fc42a
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
sendParam
.
getFd_3b16ce4b7fc42a
())))
{
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
sendParam
.
getFd_3b16ce4b7fc42a
())))
{
doSendForecastFundToEkp
(
sendParam
,
s
);
doSendForecastFundToEkp
(
sendParam
,
s
);
...
@@ -627,7 +627,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -627,7 +627,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
// 生成月份
// 生成月份
socialParam
.
setFd_3adfe8cb96c41e
(
account
.
getDeduSocialMonth
());
socialParam
.
setFd_3adfe8cb96c41e
(
account
.
getDeduSocialMonth
());
// 预估单位合计
// 预估单位合计
socialParam
.
setFd_3adfeb4e8064a8
(
account
.
get
UnitSocial
());
socialParam
.
setFd_3adfeb4e8064a8
(
account
.
get
Fd_3bcd41d857b764
());
// 预估个人合计
// 预估个人合计
socialParam
.
setFd_3adfeb52a4d2e2
(
account
.
getFd_3b16ce48a9735c
());
socialParam
.
setFd_3adfeb52a4d2e2
(
account
.
getFd_3b16ce48a9735c
());
//应收
//应收
...
@@ -763,7 +763,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -763,7 +763,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
//员工身份证
//员工身份证
socialParam
.
setFd_3adfe8c7e4cf7a
(
account
.
getFd_3adfedfb8f76d4
());
socialParam
.
setFd_3adfe8c7e4cf7a
(
account
.
getFd_3adfedfb8f76d4
());
// 预估单位代缴
// 预估单位代缴
socialParam
.
setFd_3adfeb4e8064a8
(
account
.
get
UnitFund
());
socialParam
.
setFd_3adfeb4e8064a8
(
account
.
get
Fd_3bcd41d77e4812
());
// 预估个人代缴
// 预估个人代缴
socialParam
.
setFd_3adfeb52a4d2e2
(
account
.
getFd_3b16ce4b7fc42a
());
socialParam
.
setFd_3adfeb52a4d2e2
(
account
.
getFd_3b16ce4b7fc42a
());
//应收
//应收
...
...
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