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
16c50c06
Commit
16c50c06
authored
Sep 07, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
80804c98
2321a50d
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
370 additions
and
90 deletions
+370
-90
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+30
-11
TSalaryAccountItemMapper.java
.../plus/v1/yifu/salary/mapper/TSalaryAccountItemMapper.java
+10
-0
TSalaryAccountItemService.java
...lus/v1/yifu/salary/service/TSalaryAccountItemService.java
+9
-0
TSalaryAccountItemServiceImpl.java
...fu/salary/service/impl/TSalaryAccountItemServiceImpl.java
+26
-0
TStatisticsBonusServiceImpl.java
...yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
+117
-54
TSalaryAccountItemMapper.xml
...iz/src/main/resources/mapper/TSalaryAccountItemMapper.xml
+30
-0
TForecastLibraryController.java
...v1/yifu/social/controller/TForecastLibraryController.java
+9
-0
TPaymentInfoController.java
...lus/v1/yifu/social/controller/TPaymentInfoController.java
+10
-0
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+59
-14
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+70
-11
No files found.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
16c50c06
...
...
@@ -1079,6 +1079,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
pushResult
=
pushEstimate
(
detail
,
CommonConstants
.
FIVE_INT
);
}
else
{
//预估结算中已结算,推送预估红冲
detail
.
setDefaultSettleId
(
burden
.
getId
());
pushResult
=
pushEstimate
(
detail
,
CommonConstants
.
THREE_INT
);
}
}
...
...
@@ -1089,6 +1090,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
pushResult
=
pushEstimate
(
detail
,
CommonConstants
.
FIVE_INT
);
}
else
{
//预估结算中,已结算,实缴已推送,推送实缴红冲信息
detail
.
setDefaultSettleId
(
burden
.
getId
());
pushResult
=
pushEstimate
(
detail
,
CommonConstants
.
SIX_INT
);
}
}
...
...
@@ -1099,6 +1101,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
pushResult
=
pushEstimate
(
detail
,
CommonConstants
.
FIVE_INT
);
}
else
{
//实缴结算中,已结算,推送实缴红冲信息
detail
.
setDefaultSettleId
(
burden
.
getId
());
pushResult
=
pushEstimate
(
detail
,
CommonConstants
.
SIX_INT
);
}
}
...
...
@@ -1258,6 +1261,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
tInsuranceSettleService
.
save
(
settle
);
detail
.
setDefaultSettleId
(
settle
.
getId
());
successList
.
add
(
detail
);
//生成收入数据
createInsuranceInfo
(
detail
);
}
else
{
//按天
//计算起止时间的天数
...
...
@@ -1290,9 +1295,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
tInsuranceSettleService
.
save
(
settle
);
detail
.
setDefaultSettleId
(
settle
.
getId
());
successList
.
add
(
detail
);
//生成收入数据
createInsuranceInfo
(
detail
);
}
//生成收入数据
createInsuranceInfo
(
detail
);
}
//实缴
if
(
detail
.
getSettleType
()
==
CommonConstants
.
ONE_INT
){
...
...
@@ -3984,15 +3989,28 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam
.
setEstimatePremium
(
success
.
getEstimatePremium
());
interactiveParam
.
setActualPremium
(
success
.
getActualPremium
());
interactiveParam
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
String
actual
Body
=
eKPInsuranceUtil
.
sendToEkp
(
interactiveParam
);
String
estimate
Body
=
eKPInsuranceUtil
.
sendToEkp
(
interactiveParam
);
//推送成功,更新预估和实际保费的推送状态
if
(
StringUtils
.
isNotBlank
(
actualBody
)){
newInsuranceSettle
.
setIsEstimatePush
(
CommonConstants
.
ONE_INT
);
if
(
StringUtils
.
isNotBlank
(
estimateBody
))
{
newInsuranceSettle
.
setEstimatePushTime
(
LocalDateTime
.
now
());
newInsuranceSettle
.
setIsActualPush
(
CommonConstants
.
ONE_INT
);
newInsuranceSettle
.
setActualPushTime
(
LocalDateTime
.
now
());
newInsuranceSettle
.
setIsEstimatePush
(
CommonConstants
.
ONE_INT
);
newInsuranceSettle
.
setUpdateTime
(
LocalDateTime
.
now
());
tInsuranceSettleService
.
updateById
(
newInsuranceSettle
);
//推送实缴单
interactiveParam
.
setSettleType
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
);
interactiveParam
.
setEstimatePremium
(
success
.
getEstimatePremium
());
interactiveParam
.
setActualPremium
(
success
.
getActualPremium
());
String
actualBody
=
eKPInsuranceUtil
.
sendToEkp
(
interactiveParam
);
if
(
StringUtils
.
isNotBlank
(
actualBody
))
{
//推送成功后更新本地推送状态
newInsuranceSettle
.
setActualPushTime
(
LocalDateTime
.
now
());
newInsuranceSettle
.
setIsActualPush
(
CommonConstants
.
ONE_INT
);
newInsuranceSettle
.
setUpdateTime
(
LocalDateTime
.
now
());
tInsuranceSettleService
.
updateById
(
newInsuranceSettle
);
}
else
{
//异常处理
saveInsuranceEkp
(
interactiveParam
,
CommonConstants
.
TWO_INT
);
}
}
else
{
//异常处理
saveInsuranceEkp
(
interactiveParam
,
CommonConstants
.
ONE_INT
);
...
...
@@ -5614,7 +5632,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
TInsuranceSettle
byId
=
tInsuranceSettleService
.
getById
(
defaultSettleId
);
//冲正取负数
if
(
null
!=
byId
.
getEstimatePremium
()){
param
.
setEstimatePremium
(
byId
.
getEstimatePremium
()
.
negate
()
);
param
.
setEstimatePremium
(
byId
.
getEstimatePremium
());
}
param
.
setInteractiveType
(
InsurancesConstants
.
CORRECT_SETTLE_BILL
);
param
.
setSettleType
(
InsurancesConstants
.
ESTIMATE_SETTLE_BILL
);
...
...
@@ -5626,7 +5644,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
TInsuranceSettle
byId
=
tInsuranceSettleService
.
getById
(
defaultSettleId
);
//冲正取负数
if
(
null
!=
byId
.
getActualPremium
()){
param
.
setActualPremium
(
byId
.
getActualPremium
()
.
negate
()
);
param
.
setActualPremium
(
byId
.
getActualPremium
());
}
param
.
setInteractiveType
(
InsurancesConstants
.
CORRECT_SETTLE_BILL
);
param
.
setSettleType
(
InsurancesConstants
.
ACTUAL_SETTLE_BILL
);
...
...
@@ -5716,7 +5734,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
incomeDetail
.
setDeptNo
(
insuranceDetail
.
getDeptNo
());
incomeDetail
.
setSourceType
(
CommonConstants
.
THREE_STRING
);
R
<
TIncomeDetailReturnVo
>
detailList
=
socialDaprUtils
.
getTIncomeDetailList
(
incomeDetail
);
if
(
Common
.
isNotNull
(
detailList
)
&&
detailList
.
getCode
()
==
CommonConstants
.
SUCCESS
){
if
(
Common
.
isNotNull
(
detailList
)
&&
detailList
.
getCode
()
==
CommonConstants
.
SUCCESS
&&
detailList
.
getData
().
getDetailList
().
size
()
>
0
){
isExist
=
true
;
}
...
...
@@ -5804,7 +5823,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail
.
setSourceId
(
insuranceDetail
.
getId
());
detail
.
setSourceType
(
CommonConstants
.
THREE_STRING
);
detail
.
setCreateMonth
(
DateUtil
.
getYearAndMonth
(
insuranceDetail
.
getHandledTime
(),
0
));
detail
.
setPayMonth
(
insuranceDetail
.
getSettleMonth
());
detail
.
setPayMonth
(
insuranceDetail
.
getSettleMonth
()
.
replace
(
"-"
,
""
)
);
detail
.
setMoney
(
money
);
detail
.
setFeeType
(
feeType
);
detail
.
setFeeMode
(
feeMode
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryAccountItemMapper.java
View file @
16c50c06
...
...
@@ -58,6 +58,16 @@ public interface TSalaryAccountItemMapper extends BaseMapper<TSalaryAccountItem>
**/
List
<
TSalaryAccountItem
>
getAllItemVoList
(
@Param
(
"idCardList"
)
List
<
String
>
idCardList
,
@Param
(
"invoiceTitle"
)
String
invoiceTitle
);
/**
* @param idCardList
* @param invoiceTitle
* @Description: 获取所有工资报账,组装map,计算年终奖使用
* @Author: hgw
* @Date: 2022/1/27 17:04
* @return: java.util.List<com.yifu.cloud.v1.hrms.api.entity.TSalaryAccountItem>
**/
List
<
TSalaryAccountItem
>
getSalaryItemVoList
(
@Param
(
"idCardList"
)
List
<
String
>
idCardList
,
@Param
(
"invoiceTitle"
)
String
invoiceTitle
);
/**
* @param deptId 结算主体id
* @param javaFiedName 属性名
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryAccountItemService.java
View file @
16c50c06
...
...
@@ -41,6 +41,15 @@ public interface TSalaryAccountItemService extends IService<TSalaryAccountItem>
**/
Map
<
String
,
List
<
TSalaryAccountItem
>>
getAllItemVoList
(
List
<
String
>
idCardList
,
String
invoiceTitle
);
/**
* @param idCardList
* @param invoiceTitle
* @Description: 获取所有工资报账,组装map,计算年终奖使用
* @Author: huyc
* @Date: 2022/1/27 17:25
* @return: java.util.Map<java.lang.String, java.util.List < com.yifu.cloud.v1.hrms.api.entity.TSalaryAccountItem>>
**/
Map
<
String
,
List
<
TSalaryAccountItem
>>
getSalaryItemVoList
(
List
<
String
>
idCardList
,
String
invoiceTitle
);
/**
* 工资报账表附加-工资明细简单分页查询
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountItemServiceImpl.java
View file @
16c50c06
...
...
@@ -100,6 +100,32 @@ public class TSalaryAccountItemServiceImpl extends ServiceImpl<TSalaryAccountIte
return
itemMap
;
}
/**
* @param idCardList
* @param invoiceTitle
* @Description: 获取所有工资报账,组装map,计算年终奖使用
* @Author: hgw
* @Date: 2022/1/27 17:25
* @return: java.util.Map<java.lang.String, java.util.List < com.yifu.cloud.v1.hrms.api.entity.TSalaryAccountItem>>
**/
@Override
public
Map
<
String
,
List
<
TSalaryAccountItem
>>
getSalaryItemVoList
(
List
<
String
>
idCardList
,
String
invoiceTitle
)
{
List
<
TSalaryAccountItem
>
list
=
baseMapper
.
getSalaryItemVoList
(
idCardList
,
invoiceTitle
);
Map
<
String
,
List
<
TSalaryAccountItem
>>
itemMap
=
new
HashMap
<>();
if
(
list
!=
null
&&
!
list
.
isEmpty
())
{
List
<
TSalaryAccountItem
>
voList
;
for
(
TSalaryAccountItem
item
:
list
)
{
voList
=
itemMap
.
get
(
item
.
getEmpIdcard
());
if
(
voList
==
null
)
{
voList
=
new
ArrayList
<>();
}
voList
.
add
(
item
);
itemMap
.
put
(
item
.
getEmpIdcard
(),
voList
);
}
}
return
itemMap
;
}
/**
* @param settleDepartId 结算主体id
* @param javaFiedName 属性名
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
View file @
16c50c06
...
...
@@ -32,6 +32,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.salary.constants.SalaryConstants
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccountItem
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryTaxConfig
;
...
...
@@ -41,8 +42,10 @@ import com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsBonusMapper;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAccountItemService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryTaxConfigService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsBonusService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsBonusImportVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsBonusSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
...
...
@@ -76,6 +79,8 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
private
final
TSalaryAccountMapper
accountMapper
;
private
final
SocialDaprUtils
socialDaprUtils
;
/**
* 全年一次性奖金申报表简单分页查询
* @param tStatisticsBonus 全年一次性奖金申报表
...
...
@@ -184,6 +189,8 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
BigDecimal
finalSalaryWithSalary
;
//12月已发工资税费
BigDecimal
twlSalaryTax
;
//12月社保公积金扣费
BigDecimal
socialFundTax
;
try
{
out
=
response
.
getOutputStream
();
response
.
setContentType
(
CommonConstants
.
MULTIPART_FORM_DATA
);
...
...
@@ -216,7 +223,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
idCardList
.
add
(
vo
.
getEmpIdcard
());
}
}
Map
<
String
,
List
<
TSalaryAccountItem
>>
itemMap
=
tSalaryAccountItemService
.
get
All
ItemVoList
(
idCardList
,
invoiceTitle
);
Map
<
String
,
List
<
TSalaryAccountItem
>>
itemMap
=
tSalaryAccountItemService
.
get
Salary
ItemVoList
(
idCardList
,
invoiceTitle
);
for
(
TStatisticsBonusImportVo
infoVo:
list
)
{
//本次纳税额
res
=
BigDecimal
.
ZERO
;
...
...
@@ -243,23 +250,51 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
finalSalaryWithSalary
=
BigDecimal
.
ZERO
;
//12月份应纳税所得额扣除费用
BigDecimal
deductTaxSalary
=
infoVo
.
getDeductTaxSalary
();
//12月社保公积金扣费
socialFundTax
=
BigDecimal
.
ZERO
;
//专项扣除列表
List
<
BigDecimal
>
sdSumList
=
new
ArrayList
<>();
//减除费用列表
List
<
BigDecimal
>
costReductionList
=
new
ArrayList
<>();
//查询缴费库获取生成月为12月的社保公积金扣费
List
<
TPaymentInfo
>
paymentInfoList
=
new
ArrayList
<>();
TPaymentInfo
paymentInfo
=
new
TPaymentInfo
();
paymentInfo
.
setEmpIdcard
(
infoVo
.
getEmpIdcard
());
paymentInfo
.
setSettleDomainId
(
deptId
);
R
<
TPaymentVo
>
paymentVo
=
socialDaprUtils
.
getPaymentSocialAndFound
(
paymentInfo
);
if
(
paymentVo
!=
null
&&
paymentVo
.
getData
()
!=
null
&&
paymentVo
.
getData
().
getPaymentInfoList
()
!=
null
)
{
paymentInfoList
=
paymentVo
.
getData
().
getPaymentInfoList
();
}
for
(
TPaymentInfo
infoPayment:
paymentInfoList
)
{
socialFundTax
=
BigDecimalUtils
.
safeAdd
(
infoPayment
.
getSocialSecurityPersonalSum
(),
infoPayment
.
getPersonalProvidentSum
());
}
List
<
TSalaryAccountItem
>
list1
=
itemMap
.
get
(
infoVo
.
getEmpIdcard
());
if
(
Common
.
isNotNull
(
list1
))
{
for
(
TSalaryAccountItem
item:
list1
)
{
if
(
SalaryConstants
.
SPECIAL_DEDU_MONEY_SUM_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
sdSumList
.
add
(
item
.
getSalaryMoney
());
}
if
(
SalaryConstants
.
RELAY_SALARY_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
ySalary
.
add
(
item
.
getSalaryMoney
());
ySalary
=
ySalary
.
add
(
item
.
getSalaryMoney
());
}
if
(
SalaryConstants
.
SALARY_TAX_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
sumTax
=
sumTax
.
add
(
item
.
getSalaryMoney
());
if
(
item
.
getSettlementMonth
().
contains
(
CommonConstants
.
TWELVE_STRING
))
{
//减除费用
if
(
SalaryConstants
.
COST_REDUCTION_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
costReductionList
.
add
(
item
.
getSalaryMoney
());
}
//专项扣除
if
(
SalaryConstants
.
SPECIAL_DEDU_MONEY_SUM_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
sdSumList
.
add
(
item
.
getSalaryMoney
());
}
}
//减除费用
if
(
SalaryConstants
.
COST_REDUCTION_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
costReduction
=
costReduction
.
add
(
item
.
getSalaryMoney
());
if
(
SalaryConstants
.
SALARY_TAX_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
//12月份个税
if
(
item
.
getSettlementMonth
().
contains
(
CommonConstants
.
TWELVE_STRING
))
{
twlSalaryTax
=
twlSalaryTax
.
add
(
item
.
getSalaryMoney
());
}
else
{
//1-11月份个税
sumTax
=
sumTax
.
add
(
item
.
getSalaryMoney
());
}
}
if
(
SalaryConstants
.
PERSONAL_SOCIAL_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
isTax
=
isTax
.
add
(
item
.
getSalaryMoney
());
...
...
@@ -282,11 +317,6 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if
(
SalaryConstants
.
ONLY_CHILD_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
isTax
=
isTax
.
add
(
item
.
getSalaryMoney
());
}
if
(
item
.
getSettlementMonth
().
contains
(
CommonConstants
.
TWELVE_STRING
))
{
if
(
SalaryConstants
.
SALARY_TAX
.
equals
(
item
.
getJavaFiedName
()))
{
twlSalaryTax
.
add
(
item
.
getSalaryMoney
());
}
}
}
}
if
(
CommonConstants
.
IS_TRUE
.
equals
(
infoVo
.
getIsTSend
()))
{
...
...
@@ -295,20 +325,30 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if
(
Common
.
isNotNull
(
sdSumList
))
{
sdSum
=
Collections
.
max
(
sdSumList
);
}
sumDeductSalary
=
BigDecimalUtils
.
safeAdd
(
sdSum
,
isTax
,
costReduction
);
//年终奖合并扣税
if
(
Common
.
isNotNull
(
costReductionList
))
{
costReduction
=
Collections
.
max
(
costReductionList
);
}
//当月工资已发
if
(
isSend
)
{
//年终奖单独扣税
finalSalaryNoSalary
=
BigDecimalUtils
.
safeAdd
(
calculationSalary
(
annousTax
,
infoVo
.
getAnnualBonus
()),
twlSalaryTax
);
wSalary
=
infoVo
.
getAnnualBonus
();
finalSalaryWithSalary
=
finalSalaryNoSalary
;
finalSalaryWithSalary
=
BigDecimalUtils
.
safeSubtract
(
calculationSalaryT
(
personTax
,
BigDecimalUtils
.
safeSubtract
(
BigDecimalUtils
.
safeAdd
(
ySalary
,
infoVo
.
getAnnualBonus
()),
BigDecimalUtils
.
safeAdd
(
sdSum
,
isTax
,
costReduction
))),
sumTax
);
//12月薪资扣除额合计
sumDeductSalary
=
BigDecimalUtils
.
safeAdd
(
sdSum
,
isTax
,
costReduction
);
}
else
{
//当月工资未发
//年终奖单独扣税
BigDecimal
annualTSalary
=
calculationSalaryT
(
personTax
,
infoVo
.
getAnnualTSalary
());
finalSalaryNoSalary
=
BigDecimalUtils
.
safeAdd
(
calculationSalary
(
annousTax
,
infoVo
.
getAnnualBonus
()),
annualTSalary
);
wSalary
=
BigDecimalUtils
.
safeAdd
(
infoVo
.
getAnnualBonus
(),
infoVo
.
getAnnualTSalary
());
finalSalaryWithSalary
=
calculationSalary
(
annousTax
,
wSalary
);
finalSalaryNoSalary
=
calculationSalary
(
annousTax
,
wSalary
);
//年终奖合并扣税
finalSalaryWithSalary
=
BigDecimalUtils
.
safeSubtract
(
calculationSalaryT
(
personTax
,
BigDecimalUtils
.
safeSubtract
(
BigDecimalUtils
.
safeAdd
(
wSalary
,
ySalary
),
BigDecimalUtils
.
safeAdd
(
infoVo
.
getDeductTaxSalary
(),
isTax
))),
sumTax
);
//12月薪资扣除额合计
sumDeductSalary
=
BigDecimalUtils
.
safeAdd
(
isTax
,
infoVo
.
getDeductTaxSalary
());
}
if
(
BigDecimalUtils
.
safeSubtract
(
BigDecimalUtils
.
safeAdd
(
ySalary
,
wSalary
),
sumDeductSalary
).
...
...
@@ -317,8 +357,8 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if
(
isSend
)
{
maxAnualSalary
=
wSalary
;
}
else
{
minSalary
=
deductTaxSalary
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
deductTaxSalary
);
minSalary
=
socialFundTax
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
socialFundTax
);
}
}
else
{
minSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
new
BigDecimal
(
"36000"
));
...
...
@@ -330,8 +370,8 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if
(
isSend
)
{
maxAnualSalary
=
wSalary
;
}
else
{
minSalary
=
deductTaxSalary
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
deductTaxSalary
);
minSalary
=
socialFundTax
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
socialFundTax
);
}
}
else
{
minSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
new
BigDecimal
(
"36000"
));
...
...
@@ -343,8 +383,8 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if
(
isSend
)
{
maxAnualSalary
=
wSalary
;
}
else
{
minSalary
=
deductTaxSalary
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
deductTaxSalary
);
minSalary
=
socialFundTax
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
socialFundTax
);
}
}
else
{
minSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
new
BigDecimal
(
"36000"
));
...
...
@@ -356,8 +396,8 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if
(
isSend
)
{
maxAnualSalary
=
wSalary
;
}
else
{
minSalary
=
deductTaxSalary
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
deductTaxSalary
);
minSalary
=
socialFundTax
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
socialFundTax
);
}
}
else
{
minSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
new
BigDecimal
(
"144000"
));
...
...
@@ -369,8 +409,8 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if
(
isSend
)
{
maxAnualSalary
=
wSalary
;
}
else
{
minSalary
=
deductTaxSalary
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
deductTaxSalary
);
minSalary
=
socialFundTax
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
socialFundTax
);
}
}
else
{
minSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
new
BigDecimal
(
"36000"
));
...
...
@@ -382,8 +422,8 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if
(
isSend
)
{
maxAnualSalary
=
wSalary
;
}
else
{
minSalary
=
deductTaxSalary
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
deductTaxSalary
);
minSalary
=
socialFundTax
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
socialFundTax
);
}
}
else
{
minSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
new
BigDecimal
(
"300000"
));
...
...
@@ -395,8 +435,8 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if
(
isSend
)
{
maxAnualSalary
=
wSalary
;
}
else
{
minSalary
=
deductTaxSalary
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
deductTaxSalary
);
minSalary
=
socialFundTax
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
socialFundTax
);
}
}
else
{
minSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
new
BigDecimal
(
"420000"
));
...
...
@@ -408,28 +448,32 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if
(
isSend
)
{
maxAnualSalary
=
wSalary
;
}
else
{
minSalary
=
deductTaxSalary
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
deductTaxSalary
);
minSalary
=
socialFundTax
;
maxAnualSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
socialFundTax
);
}
}
else
{
minSalary
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
new
BigDecimal
(
"660000"
));
maxAnualSalary
=
new
BigDecimal
(
"660000"
);
}
}
JSONObject
jsonObject
=
calculationPersonSalary
(
personTax
,
annousTax
,
minSalary
,
maxAnualSalary
,
wSalary
,
sumTax
);
JSONObject
jsonObject
=
calculationPersonSalary
(
personTax
,
annousTax
,
minSalary
,
maxAnualSalary
,
wSalary
,
sumTax
,
ySalary
,
sumDeductSalary
,
twlSalaryTax
);
res
=
jsonObject
.
getBigDecimal
(
"zySalary"
);
Map
<
String
,
BigDecimal
>
map
=
jsonObject
.
getObject
(
"anRes"
,
Map
.
class
);
BigDecimal
anRes
=
BigDecimal
.
ZERO
;
if
(
Common
.
isNotNull
(
jsonObject
.
getBigDecimal
(
"anRes"
)))
{
anRes
=
jsonObject
.
getBigDecimal
(
"anRes"
);
}
infoVo
.
setBestPlanTax
(
res
);
infoVo
.
setAnnualATax
(
finalSalaryNoSalary
);
infoVo
.
setAnnualSTax
(
finalSalaryWithSalary
);
infoVo
.
setBestPlanTSalary
(
map
.
get
(
res
.
toString
())
);
infoVo
.
setBestPlanBonus
(
BigDecimalUtils
.
safeSubtract
(
wSalary
,
map
.
get
(
res
.
toString
())
));
infoVo
.
setBestPlanTSalary
(
anRes
);
infoVo
.
setBestPlanBonus
(
BigDecimalUtils
.
safeSubtract
(
wSalary
,
anRes
));
}
if
(
Common
.
isNotNull
(
list
))
{
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"全年一次性奖金测算"
).
build
();
excelWriter
.
write
(
list
,
writeSheet
);
}
}
else
{
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"全年一次性奖金测算"
).
build
();
excelWriter
.
write
(
list
,
writeSheet
);
...
...
@@ -466,28 +510,47 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
**/
private
static
JSONObject
calculationPersonSalary
(
List
<
TSalaryTaxConfig
>
personTax
,
List
<
TSalaryTaxConfig
>
annousTax
,
BigDecimal
minSalary
,
BigDecimal
maxAnualSalary
,
BigDecimal
wSalary
,
BigDecimal
sumTax
)
{
BigDecimal
wSalary
,
BigDecimal
sumTax
,
BigDecimal
ySalary
,
BigDecimal
sumDeductSalary
,
BigDecimal
twlSalaryTax
)
{
JSONObject
jsonObject
=
new
JSONObject
();
BigDecimal
anRes
;
BigDecimal
res
;
List
<
BigDecimal
>
zySalary
=
new
ArrayList
<>();
Map
<
String
,
BigDecimal
>
map
=
new
HashMap
<>();
for
(
BigDecimal
i
=
minSalary
;
i
.
compareTo
(
maxAnualSalary
)
<=
0
;
i
=
BigDecimalUtils
.
safeAdd
(
i
,
new
BigDecimal
(
100
))
)
{
//本次薪资纳税额
BigDecimal
res
=
BigDecimal
.
ZERO
;
res
=
BigDecimal
.
ZERO
;
//本次年终奖纳税额
anRes
=
BigDecimal
.
ZERO
;;
//年终奖金额
BigDecimal
annous
=
BigDecimalUtils
.
safeSubtract
(
wSalary
,
i
);
//计算个税
for
(
TSalaryTaxConfig
sub
:
personTax
)
{
if
(
i
.
compareTo
(
sub
.
getMinIncome
())
==
SalaryConstants
.
MORE_THAN
&&
i
.
compareTo
(
sub
.
getMaxIncome
())
!=
SalaryConstants
.
MORE_THAN
)
{
//i = realDeduSalary * ((double) ((i.getTaxRate() * 1.0) / 100)) - sumTax - sub.getQuick();
res
=
i
.
multiply
(
new
BigDecimal
(
sub
.
getWithholdingRate
()).
divide
(
SalaryConstants
.
B_ONEHUNDRED
,
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
))
.
subtract
(
sumTax
).
subtract
(
sub
.
getQuickDeducation
());
// 应纳税额
break
;
if
(
i
.
compareTo
(
BigDecimal
.
ZERO
)
==
SalaryConstants
.
MORE_THAN
)
{
BigDecimal
sumI
=
BigDecimalUtils
.
safeSubtract
(
BigDecimalUtils
.
safeAdd
(
i
,
ySalary
),
BigDecimalUtils
.
safeAdd
(
sumDeductSalary
));
for
(
TSalaryTaxConfig
sub
:
personTax
)
{
if
(
sumI
.
compareTo
(
sub
.
getMinIncome
())
==
SalaryConstants
.
MORE_THAN
&&
sumI
.
compareTo
(
sub
.
getMaxIncome
())
!=
SalaryConstants
.
MORE_THAN
)
{
//sumI = realDeduSalary * ((double) ((i.getTaxRate() * 1.0) / 100)) - sumTax - sub.getQuick();
//累计个税
res
=
BigDecimalUtils
.
safeSubtract
(
sumI
.
multiply
(
new
BigDecimal
(
sub
.
getWithholdingRate
()).
divide
(
SalaryConstants
.
B_ONEHUNDRED
,
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
)),
sub
.
getQuickDeducation
());
//本次个税
BigDecimal
bcTax
=
res
.
subtract
(
BigDecimalUtils
.
safeAdd
(
sumTax
,
twlSalaryTax
));
if
(
bcTax
.
compareTo
(
BigDecimal
.
ZERO
)
==
SalaryConstants
.
MORE_THAN
||
bcTax
.
compareTo
(
BigDecimal
.
ZERO
)
==
SalaryConstants
.
EQUAL
)
{
res
=
BigDecimalUtils
.
safeAdd
(
bcTax
,
twlSalaryTax
);
}
else
{
res
=
BigDecimalUtils
.
safeAdd
(
twlSalaryTax
,
sumTax
);
}
res
=
BigDecimalUtils
.
safeSubtract
(
sumI
.
multiply
(
new
BigDecimal
(
sub
.
getWithholdingRate
()).
divide
(
SalaryConstants
.
B_ONEHUNDRED
,
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
)),
BigDecimalUtils
.
safeAdd
(
sumTax
,
sub
.
getQuickDeducation
()));
break
;
}
}
}
else
{
res
=
twlSalaryTax
;
}
//计算年终奖税
//年终奖
...
...
@@ -512,7 +575,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if
(
Common
.
isNotNull
(
zySalary
))
{
salary
=
Collections
.
min
(
zySalary
);
}
jsonObject
.
put
(
"anRes"
,
map
);
jsonObject
.
put
(
"anRes"
,
map
.
get
(
salary
.
toString
())
);
jsonObject
.
put
(
"zySalary"
,
salary
);
map
.
clear
();
zySalary
.
clear
();
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountItemMapper.xml
View file @
16c50c06
...
...
@@ -434,6 +434,36 @@
AND a.DELETE_FLAG = 0 and a.FORM_TYPE != 7
</where>
</select>
<!-- 获取所有数据,组装map,工资导入使用 -->
<select
id=
"getSalaryItemVoList"
resultMap=
"itemVoMap"
>
SELECT
i.ID,
i.SALARY_ACCOUNT_ID,
i.CN_NAME,
i.JAVA_FIED_NAME,
i.SALARY_MONEY,
i.TEXT_VALUE,
i.IS_TAX,
a.EMP_IDCARD,
a.SETTLEMENT_MONTH,
a.FORM_TYPE
FROM
t_salary_account_item i left join t_salary_account a on i.SALARY_ACCOUNT_ID = a.ID
<where>
a.SETTLEMENT_MONTH like DATE_FORMAT(now(),"%Y%")
<if
test=
"idCardList != null"
>
AND a.EMP_IDCARD in
<foreach
item=
"item"
index=
"index"
collection=
"idCardList"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</if>
<if
test=
"invoiceTitle != null and invoiceTitle.trim() != ''"
>
AND a.INVOICE_TITLE = #{invoiceTitle}
</if>
AND a.DELETE_FLAG = 0 and a.FORM_TYPE = 0
</where>
</select>
<select
id=
"getSumByAccountId"
resultType=
"java.util.Map"
>
SELECT
a.SALARY_ACCOUNT_ID as 'key',
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TForecastLibraryController.java
View file @
16c50c06
...
...
@@ -288,4 +288,13 @@ public class TForecastLibraryController {
tForecastLibraryService
.
createForecastFundInfo
();
}
@PostMapping
(
"/createFundInfo"
)
public
void
createFundInfo
()
{
tForecastLibraryService
.
createForecastFundInfo
();
}
@PostMapping
(
"/createSocialInfo"
)
public
void
createSocialInfo
()
{
tForecastLibraryService
.
createForecastInfo
();
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java
View file @
16c50c06
...
...
@@ -341,6 +341,16 @@ public class TPaymentInfoController {
tPaymentInfoService
.
createPaymentFundInfo
();
}
@PostMapping
(
"/createFundInfo"
)
public
void
createFundInfo
()
{
tPaymentInfoService
.
createPaymentFundInfo
();
}
@PostMapping
(
"/createSocialInfo"
)
public
void
createSocialInfo
()
{
tPaymentInfoService
.
createPaymentSocialInfo
();
}
/**
* @Description: 定时生成缴费库的收入数据
* @Author: huyc
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
16c50c06
...
...
@@ -2209,6 +2209,20 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
public
List
<
String
>
initEkpPushSocialParam
(
List
<
TForecastLibrary
>
unPushInfo
)
{
List
<
String
>
pushList
=
new
ArrayList
<>();
for
(
TForecastLibrary
library:
unPushInfo
)
{
//获取项目信息
TSettleDomain
settleDomain
=
new
TSettleDomain
();
List
<
TSettleDomainSelectVo
>
settleDomainR
=
null
;
R
<
TSettleDomainListVo
>
listVo
=
null
;
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoById
(
library
.
getSettleDomainId
());
if
(
Common
.
isNotNull
(
listVo
))
{
TSettleDomainListVo
tSettleDomainListVo
=
listVo
.
getData
();
if
(
Common
.
isNotNull
(
tSettleDomainListVo
)
&&
Common
.
isNotEmpty
(
tSettleDomainListVo
.
getListSelectVO
()))
{
settleDomainR
=
tSettleDomainListVo
.
getListSelectVO
();
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
BeanUtils
.
copyProperties
(
vo
,
settleDomain
);
}
}
}
EkpPushSocialParam
socialParam
=
new
EkpPushSocialParam
();
//员工姓名
socialParam
.
setFd_3adfe8c79989d4
(
library
.
getEmpName
());
...
...
@@ -2298,13 +2312,13 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
}
//社保缴纳月份
if
(
Common
.
isNotNull
(
library
.
getSocialPayMonth
()))
{
socialParam
.
setFd_3adfe8cf632700
(
library
.
getSocialPayMonth
(
));
socialParam
.
setFd_3adfe8cf632700
(
dateStringInsert
(
library
.
getSocialPayMonth
()
));
}
else
{
socialParam
.
setFd_3adfe8cf632700
(
CommonConstants
.
EMPTY_STRING
);
}
//社保生成月份
if
(
Common
.
isNotNull
(
library
.
getSocialCreateMonth
()))
{
socialParam
.
setFd_3adfe8cb96c41e
(
library
.
getSocialCreateMonth
(
));
socialParam
.
setFd_3adfe8cb96c41e
(
dateStringInsert
(
library
.
getSocialCreateMonth
()
));
}
else
{
socialParam
.
setFd_3adfe8cb96c41e
(
CommonConstants
.
EMPTY_STRING
);
}
...
...
@@ -2313,7 +2327,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
//是否有预估
socialParam
.
setFd_3add9de0be85e4
(
CommonConstants
.
IS_TRUE
);
//与工资合并结算
socialParam
.
setFd_3add9e1a670144
(
CommonConstants
.
EMPTY_STRING
);
socialParam
.
setFd_3add9e1a670144
(
CommonConstants
.
IS_FALSE
);
//项目编码
socialParam
.
setFd_3adfe8c70d3fd4
(
library
.
getDeptNo
());
//项目名称
...
...
@@ -2321,7 +2335,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
//单号
socialParam
.
setFd_3adfe95c169c48
(
CommonConstants
.
EMPTY_STRING
);
//客户编码
socialParam
.
setFd_3adfe8c73cb5a4
(
CommonConstants
.
EMPTY_STRING
);
if
(
Common
.
isNotNull
(
settleDomain
.
getCustomerNo
()))
{
socialParam
.
setFd_3adfe8c73cb5a4
(
settleDomain
.
getCustomerNo
());
}
else
{
socialParam
.
setFd_3adfe8c73cb5a4
(
CommonConstants
.
EMPTY_STRING
);
}
//客户名称
socialParam
.
setFd_3adfe8c81a0e42
(
library
.
getUnitName
());
//社保户
...
...
@@ -2419,6 +2437,20 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
public
List
<
String
>
initEkpPushFundParam
(
List
<
TForecastLibrary
>
unPushInfo
)
{
List
<
String
>
pushList
=
new
ArrayList
<>();
for
(
TForecastLibrary
library:
unPushInfo
)
{
//获取项目信息
TSettleDomain
settleDomain
=
new
TSettleDomain
();
List
<
TSettleDomainSelectVo
>
settleDomainR
=
null
;
R
<
TSettleDomainListVo
>
listVo
=
null
;
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoById
(
library
.
getSettleDomainId
());
if
(
Common
.
isNotNull
(
listVo
))
{
TSettleDomainListVo
tSettleDomainListVo
=
listVo
.
getData
();
if
(
Common
.
isNotNull
(
tSettleDomainListVo
)
&&
Common
.
isNotEmpty
(
tSettleDomainListVo
.
getListSelectVO
()))
{
settleDomainR
=
tSettleDomainListVo
.
getListSelectVO
();
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
BeanUtils
.
copyProperties
(
vo
,
settleDomain
);
}
}
}
EkpPushFundParam
fundParam
=
new
EkpPushFundParam
();
//员工姓名
fundParam
.
setFd_3adfe8c79989d4
(
library
.
getEmpName
());
...
...
@@ -2438,13 +2470,13 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
}
//缴纳月份
if
(
Common
.
isNotNull
(
library
.
getSocialPayMonth
()))
{
fundParam
.
setFd_3adfe8cf632700
(
library
.
getSocialPayMonth
(
));
fundParam
.
setFd_3adfe8cf632700
(
dateStringInsert
(
library
.
getSocialPayMonth
()
));
}
else
{
fundParam
.
setFd_3adfe8cf632700
(
CommonConstants
.
EMPTY_STRING
);
}
//生成月份
if
(
Common
.
isNotNull
(
library
.
getSocialCreateMonth
()))
{
fundParam
.
setFd_3adfe8cb96c41e
(
library
.
getSocialCreateMonth
(
));
fundParam
.
setFd_3adfe8cb96c41e
(
dateStringInsert
(
library
.
getSocialCreateMonth
()
));
}
else
{
fundParam
.
setFd_3adfe8cb96c41e
(
CommonConstants
.
EMPTY_STRING
);
}
...
...
@@ -2463,7 +2495,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
//是否有预估
fundParam
.
setFd_3add9de0be85e4
(
CommonConstants
.
IS_TRUE
);
//与工资合并结算
fundParam
.
setFd_3add9e1a670144
(
CommonConstants
.
EMPTY_STRING
);
fundParam
.
setFd_3add9e1a670144
(
CommonConstants
.
IS_FALSE
);
//项目编码
fundParam
.
setFd_3adfe8c70d3fd4
(
library
.
getDeptNo
());
//项目名称
...
...
@@ -2471,7 +2503,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
//单号
fundParam
.
setFd_3adfe95c169c48
(
CommonConstants
.
EMPTY_STRING
);
//客户编码
fundParam
.
setFd_3adfe8c73cb5a4
(
CommonConstants
.
EMPTY_STRING
);
if
(
Common
.
isNotNull
(
settleDomain
.
getCustomerNo
()))
{
fundParam
.
setFd_3adfe8c73cb5a4
(
settleDomain
.
getCustomerNo
());
}
else
{
fundParam
.
setFd_3adfe8c73cb5a4
(
CommonConstants
.
EMPTY_STRING
);
}
//单位代缴
fundParam
.
setFd_3adfeb52fbe966
(
CommonConstants
.
EMPTY_STRING
);
//个人代缴
...
...
@@ -2543,7 +2579,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
String
sourceType
=
""
;
if
(
Common
.
isNotNull
(
library
.
getProvidentId
()))
{
sourceType
=
CommonConstants
.
TWO_STRING
;
}
else
{
}
else
if
(
Common
.
isNotNull
(
library
.
getSocialId
()))
{
sourceType
=
CommonConstants
.
ONE_STRING
;
}
...
...
@@ -2565,8 +2601,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
int
isSum
=
0
;
if
(
Common
.
isNotNull
(
settleDomain
))
{
// 含有社保,则计算收入
if
(
Common
.
isNotNull
(
settleDomain
.
getManageServerItem
())
&&
(
settleDomain
.
getManageServerItem
().
contains
(
CommonConstants
.
ONE_STRING
)
||
settleDomain
.
getManageServerItem
().
contains
(
CommonConstants
.
TWO_STRING
)))
{
if
(
Common
.
isNotNull
(
settleDomain
.
getManageServerItem
())
&&
((
settleDomain
.
getManageServerItem
().
contains
(
CommonConstants
.
ONE_STRING
)
&&
CommonConstants
.
ONE_STRING
.
equals
(
sourceType
))
||
(
settleDomain
.
getManageServerItem
().
contains
(
CommonConstants
.
TWO_STRING
))
&&
CommonConstants
.
ONE_STRING
.
equals
(
sourceType
)))
{
//预估模式
if
(
CommonConstants
.
ONE_STRING
.
equals
(
settleDomain
.
getMrSettleType
()))
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
settleDomain
.
getManagementTag
()))
{
...
...
@@ -2597,8 +2634,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
}
}
}
if
(
Common
.
isNotNull
(
settleDomain
.
getRiskServerItem
())
&&
(
settleDomain
.
getRiskServerItem
().
contains
(
CommonConstants
.
ONE_STRING
)
||
settleDomain
.
getRiskServerItem
().
contains
(
CommonConstants
.
TWO_STRING
)))
{
if
(
Common
.
isNotNull
(
settleDomain
.
getRiskServerItem
())
&&
((
settleDomain
.
getRiskServerItem
().
contains
(
CommonConstants
.
ONE_STRING
)
&&
CommonConstants
.
ONE_STRING
.
equals
(
sourceType
))
||
(
settleDomain
.
getRiskServerItem
().
contains
(
CommonConstants
.
TWO_STRING
))
&&
CommonConstants
.
ONE_STRING
.
equals
(
sourceType
)))
{
//预估模式
if
(
CommonConstants
.
ONE_STRING
.
equals
(
settleDomain
.
getMrSettleType
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
settleDomain
.
getRiskFundTag
()))
{
...
...
@@ -2651,7 +2689,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
if
(
CommonConstants
.
ONE_STRING
.
equals
(
sourceType
))
{
detail
.
setCreateMonth
(
library
.
getSocialCreateMonth
());
detail
.
setPayMonth
(
library
.
getSocialPayMonth
());
}
else
{
}
else
if
(
CommonConstants
.
TWO_STRING
.
equals
(
sourceType
))
{
detail
.
setCreateMonth
(
library
.
getProvidentCreateMonth
());
detail
.
setPayMonth
(
library
.
getProvidentPayMonth
());
}
...
...
@@ -2664,4 +2702,11 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
incomeService
.
saveDetail
(
detail
);
}
public
String
dateStringInsert
(
String
month
)
{
StringBuilder
sb
=
new
StringBuilder
(
month
);
sb
.
insert
(
4
,
"-"
);
String
replaceMonth
=
sb
.
toString
();
return
replaceMonth
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
16c50c06
...
...
@@ -64,6 +64,7 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentHeFeiVo;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoVo
;
import
lombok.extern.log4j.Log4j2
;
import
org.checkerframework.checker.units.qual.C
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -2311,6 +2312,21 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
public
List
<
String
>
initEkpPushSocialParam
(
List
<
TPaymentInfo
>
unPushInfo
)
{
List
<
String
>
pushList
=
new
ArrayList
<>();
for
(
TPaymentInfo
library:
unPushInfo
)
{
//获取项目信息
TSettleDomain
settleDomain
=
new
TSettleDomain
();
List
<
TSettleDomainSelectVo
>
settleDomainR
=
null
;
R
<
TSettleDomainListVo
>
listVo
=
null
;
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoById
(
library
.
getSettleDomainId
());
if
(
Common
.
isNotNull
(
listVo
))
{
TSettleDomainListVo
tSettleDomainListVo
=
listVo
.
getData
();
if
(
Common
.
isNotNull
(
tSettleDomainListVo
)
&&
Common
.
isNotEmpty
(
tSettleDomainListVo
.
getListSelectVO
()))
{
settleDomainR
=
tSettleDomainListVo
.
getListSelectVO
();
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
BeanUtils
.
copyProperties
(
vo
,
settleDomain
);
}
}
}
EkpPushSocialParam
socialParam
=
new
EkpPushSocialParam
();
//员工姓名
socialParam
.
setFd_3adfe8c79989d4
(
library
.
getEmpName
());
...
...
@@ -2352,22 +2368,27 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
//社保缴纳月份
if
(
Common
.
isNotNull
(
library
.
getSocialPayMonth
()))
{
socialParam
.
setFd_3adfe8cf632700
(
library
.
getSocialPayMonth
(
));
socialParam
.
setFd_3adfe8cf632700
(
dateStringInsert
(
library
.
getSocialPayMonth
()
));
}
else
{
socialParam
.
setFd_3adfe8cf632700
(
CommonConstants
.
EMPTY_STRING
);
}
//社保生成月份
if
(
Common
.
isNotNull
(
library
.
getSocialCreateMonth
()))
{
socialParam
.
setFd_3adfe8cb96c41e
(
library
.
getSocialCreateMonth
(
));
socialParam
.
setFd_3adfe8cb96c41e
(
dateStringInsert
(
library
.
getSocialCreateMonth
()
));
}
else
{
socialParam
.
setFd_3adfe8cb96c41e
(
CommonConstants
.
EMPTY_STRING
);
}
//订单类型
socialParam
.
setFd_3add9dd7833db8
(
SocialConstants
.
DIFF_TYPE_THR
);
//是否有预估
socialParam
.
setFd_3add9de0be85e4
(
CommonConstants
.
EMPTY_STRING
);
if
(
Common
.
isNotNull
(
settleDomain
.
getMrSettleType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
settleDomain
.
getMrSettleType
()))
{
socialParam
.
setFd_3add9de0be85e4
(
CommonConstants
.
IS_TRUE
);
}
else
{
socialParam
.
setFd_3add9de0be85e4
(
CommonConstants
.
IS_FALSE
);
}
//与工资合并结算
socialParam
.
setFd_3add9e1a670144
(
CommonConstants
.
EMPTY_STRING
);
socialParam
.
setFd_3add9e1a670144
(
CommonConstants
.
IS_FALSE
);
//项目编码
socialParam
.
setFd_3adfe8c70d3fd4
(
library
.
getSettleDomainCode
());
//项目名称
...
...
@@ -2375,9 +2396,17 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//单号
socialParam
.
setFd_3adfe95c169c48
(
CommonConstants
.
EMPTY_STRING
);
//客户编码
socialParam
.
setFd_3adfe8c73cb5a4
(
CommonConstants
.
EMPTY_STRING
);
if
(
Common
.
isNotNull
(
settleDomain
.
getCustomerNo
()))
{
socialParam
.
setFd_3adfe8c73cb5a4
(
settleDomain
.
getCustomerNo
());
}
else
{
socialParam
.
setFd_3adfe8c73cb5a4
(
CommonConstants
.
EMPTY_STRING
);
}
//客户名称
socialParam
.
setFd_3adfe8c81a0e42
(
library
.
getUnitName
());
if
(
Common
.
isNotNull
(
library
.
getUnitName
()))
{
socialParam
.
setFd_3adfe8c81a0e42
(
library
.
getUnitName
());
}
else
{
socialParam
.
setFd_3adfe8c81a0e42
(
CommonConstants
.
EMPTY_STRING
);
}
//社保户
if
(
Common
.
isNotNull
(
library
.
getSocialHousehold
()))
{
socialParam
.
setFd_3aeafa25916e82
(
library
.
getSocialHousehold
());
...
...
@@ -2521,6 +2550,20 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
public
List
<
String
>
initEkpPushFundParam
(
List
<
TPaymentInfo
>
unPushInfo
)
{
List
<
String
>
pushList
=
new
ArrayList
<>();
for
(
TPaymentInfo
library:
unPushInfo
)
{
//获取项目信息
TSettleDomain
settleDomain
=
new
TSettleDomain
();
List
<
TSettleDomainSelectVo
>
settleDomainR
=
null
;
R
<
TSettleDomainListVo
>
listVo
=
null
;
listVo
=
archivesDaprUtil
.
selectSettleDomainSelectVoById
(
library
.
getSettleDomainId
());
if
(
Common
.
isNotNull
(
listVo
))
{
TSettleDomainListVo
tSettleDomainListVo
=
listVo
.
getData
();
if
(
Common
.
isNotNull
(
tSettleDomainListVo
)
&&
Common
.
isNotEmpty
(
tSettleDomainListVo
.
getListSelectVO
()))
{
settleDomainR
=
tSettleDomainListVo
.
getListSelectVO
();
for
(
TSettleDomainSelectVo
vo
:
settleDomainR
)
{
BeanUtils
.
copyProperties
(
vo
,
settleDomain
);
}
}
}
EkpPushFundParam
fundParam
=
new
EkpPushFundParam
();
//员工姓名
fundParam
.
setFd_3adfe8c79989d4
(
library
.
getEmpName
());
...
...
@@ -2532,13 +2575,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
fundParam
.
setFd_3adfeb52a4d2e2
(
CommonConstants
.
EMPTY_STRING
);
//缴纳月份
if
(
Common
.
isNotNull
(
library
.
getProvidentPayMonth
()))
{
fundParam
.
setFd_3adfe8cf632700
(
library
.
getProvidentPayMonth
(
));
fundParam
.
setFd_3adfe8cf632700
(
dateStringInsert
(
library
.
getProvidentPayMonth
()
));
}
else
{
fundParam
.
setFd_3adfe8cf632700
(
CommonConstants
.
EMPTY_STRING
);
}
//生成月份
if
(
Common
.
isNotNull
(
library
.
getProvidentCreateMonth
()))
{
fundParam
.
setFd_3adfe8cb96c41e
(
library
.
getProvidentCreateMonth
(
));
fundParam
.
setFd_3adfe8cb96c41e
(
dateStringInsert
(
library
.
getProvidentCreateMonth
()
));
}
else
{
fundParam
.
setFd_3adfe8cb96c41e
(
CommonConstants
.
EMPTY_STRING
);
}
...
...
@@ -2555,9 +2598,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//订单类型
fundParam
.
setFd_3add9dd7833db8
(
SocialConstants
.
DIFF_TYPE_THR
);
//是否有预估
fundParam
.
setFd_3add9de0be85e4
(
CommonConstants
.
EMPTY_STRING
);
if
(
Common
.
isNotNull
(
settleDomain
.
getMrSettleType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
settleDomain
.
getMrSettleType
()))
{
fundParam
.
setFd_3add9de0be85e4
(
CommonConstants
.
IS_TRUE
);
}
else
{
fundParam
.
setFd_3add9de0be85e4
(
CommonConstants
.
IS_FALSE
);
}
//与工资合并结算
fundParam
.
setFd_3add9e1a670144
(
CommonConstants
.
EMPTY_STRING
);
fundParam
.
setFd_3add9e1a670144
(
CommonConstants
.
IS_FALSE
);
//项目编码
fundParam
.
setFd_3adfe8c70d3fd4
(
library
.
getSettleDomainCode
());
//项目名称
...
...
@@ -2565,7 +2613,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//单号
fundParam
.
setFd_3adfe95c169c48
(
CommonConstants
.
EMPTY_STRING
);
//客户编码
fundParam
.
setFd_3adfe8c73cb5a4
(
CommonConstants
.
EMPTY_STRING
);
if
(
Common
.
isNotNull
(
settleDomain
.
getCustomerNo
()))
{
fundParam
.
setFd_3adfe8c73cb5a4
(
settleDomain
.
getCustomerNo
());
}
else
{
fundParam
.
setFd_3adfe8c73cb5a4
(
CommonConstants
.
EMPTY_STRING
);
}
//单位代缴
if
(
Common
.
isNotNull
(
library
.
getUnitProvidentSum
()))
{
fundParam
.
setFd_3adfeb52fbe966
(
library
.
getUnitProvidentSum
().
toString
());
...
...
@@ -2771,4 +2823,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
detail
.
setId
(
CommonConstants
.
NULL
);
incomeService
.
saveDetail
(
detail
);
}
public
String
dateStringInsert
(
String
month
)
{
StringBuilder
sb
=
new
StringBuilder
(
month
);
sb
.
insert
(
4
,
"-"
);
String
replaceMonth
=
sb
.
toString
();
return
replaceMonth
;
}
}
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