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
8bc1216d
Commit
8bc1216d
authored
Nov 11, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
888a8f34
dd799215
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
157 additions
and
35 deletions
+157
-35
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+3
-6
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+2
-0
EkpPushFundParam.java
.../com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushFundParam.java
+5
-0
EkpPushSocialParam.java
...om/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushSocialParam.java
+4
-0
ekpIncomeConfig.properties
...-common-ekp/src/main/resources/ekpIncomeConfig.properties
+2
-2
ekpInsuranceConfig.properties
...mmon-ekp/src/main/resources/ekpInsuranceConfig.properties
+2
-2
ekpOrderConfig.properties
...u-common-ekp/src/main/resources/ekpOrderConfig.properties
+4
-4
ekpSalaryConfig.properties
...-common-ekp/src/main/resources/ekpSalaryConfig.properties
+2
-2
TPaymentInfo.java
...m/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
+6
-0
SocialConstants.java
.../cloud/plus/v1/yifu/social/constants/SocialConstants.java
+1
-0
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+126
-19
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
8bc1216d
...
...
@@ -220,12 +220,9 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
updateTEmployeePro
.
setBusinessPrimaryType
(
tSettleDomain
.
getBusinessPrimaryType
());
updateTEmployeePro
.
setBusinessSecondType
(
tSettleDomain
.
getBusinessSecondType
());
updateTEmployeePro
.
setBusinessThirdType
(
tSettleDomain
.
getBusinessThirdType
());
TCustomerInfo
tCustomerInfo
=
tCustomerInfoService
.
getById
(
tSettleDomain
.
getCustomerId
());
if
(
Common
.
isNotNull
(
tCustomerInfo
))
{
updateTEmployeePro
.
setUnitId
(
tCustomerInfo
.
getId
());
updateTEmployeePro
.
setUnitNo
(
tCustomerInfo
.
getCustomerCode
());
updateTEmployeePro
.
setUnitName
(
tCustomerInfo
.
getCustomerName
());
}
updateTEmployeePro
.
setUnitId
(
tSettleDomain
.
getCustomerId
());
updateTEmployeePro
.
setUnitNo
(
tSettleDomain
.
getCustomerNo
());
updateTEmployeePro
.
setUnitName
(
tSettleDomain
.
getCustomerName
());
updateTEmployeePro
.
setChangeStartMonth
(
excel
.
getChangeStartMonth
());
updateTEmployeePro
.
setUnsettleDeal
(
CommonConstants
.
IS_NO_CHANGE
);
updateList
.
add
(
updateTEmployeePro
);
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
8bc1216d
...
...
@@ -449,6 +449,8 @@ public interface CommonConstants {
public
static
final
String
PAYMENT_SOCIAL_WAIT_EXPORT
=
"payment_social_wait_export"
;
public
static
final
String
PAYMENT_SOCIAL_PUSH
=
"payment_social_push"
;
//百分之一 1/100
public
static
final
BigDecimal
ONE_OF_PERCENT
=
new
BigDecimal
(
"0.01"
);
...
...
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushFundParam.java
View file @
8bc1216d
...
...
@@ -148,4 +148,9 @@ public class EkpPushFundParam implements Serializable {
* 薪酬申请编号
**/
private
String
fd_3b3cabde83d1d0
;
/**
* 公积金创建人姓名
**/
private
String
fd_3b43922217c6f8
;
}
\ No newline at end of file
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushSocialParam.java
View file @
8bc1216d
...
...
@@ -252,5 +252,9 @@ public class EkpPushSocialParam implements Serializable {
* 薪酬申请编号
**/
private
String
fd_3b3cab77923f44
;
/**
* 社保创建人姓名
**/
private
String
fd_3b438e33f37378
;
}
\ No newline at end of file
yifu-common/yifu-common-ekp/src/main/resources/ekpIncomeConfig.properties
View file @
8bc1216d
#
income.url=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
income.url
=
http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
income.url
=
http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
#
income.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
income.fdModelIdManage
=
181d76db26e419a88dba97b0c406689e
income.fdFlowIdManage
=
182d3b6e522b2690119e70d4ff082136
income.fdModelIdRisk
=
181d76db26e4112e14b9bb4274d06ba1
...
...
yifu-common/yifu-common-ekp/src/main/resources/ekpInsuranceConfig.properties
View file @
8bc1216d
#
insurance.insuranceUrl=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
insurance.insuranceUrl
=
http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
insurance.insuranceUrl
=
http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
#
insurance.insuranceUrl=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
insurance.insuranceFdModelId
=
181d73279372e5a55438a47d7436ab7e
insurance.insuranceFdFlowId
=
18267f206233f29cbd3c5ee425c9408a
insurance.insuranceDocStatus
=
20
...
...
yifu-common/yifu-common-ekp/src/main/resources/ekpOrderConfig.properties
View file @
8bc1216d
#
ekporder.url=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
ekporder.url
=
http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
ekporder.url
=
http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
#
ekporder.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
ekporder.orderFdModelId
=
182f1b7ffe2e96f975564e44e559847d
ekporder.orderFdFlowId
=
182f1c098ce991ca96bc927408792beb
ekporder.replyFdModelId
=
182f1bb35bb2156fb9a02904bc88dd8a
...
...
@@ -7,7 +7,7 @@ ekporder.replyFdFlowId=182f1c3d6f5724e335b88d544be8c993
ekporder.replyAttachKey
=
fd_3ac904c9342fe2
ekporder.docStatus
=
20
ekporder.LoginName
=
admin
ekporder.orderDocSubject
=
\u7528\u
4
e8e
\u9879\u
76ee
\u
8ba2
\u5355\u
66f4
\u
65b0
\u
63a5
\u
53e
3
ekporder.replyDocSubject
=
\u7528\u
4
e8e
\u
8ba2
\u5355\u
56de
\u
590d
\u
63a5
\u
53e
3
ekporder.orderDocSubject
=
\u7528\u
4
E8E
\u9879\u
76EE
\u
8BA2
\u5355\u
66F4
\u
65B0
\u
63A5
\u
53E
3
ekporder.replyDocSubject
=
\u7528\u
4
E8E
\u
8BA2
\u5355\u
56DE
\u
590D
\u
63A5
\u
53E
3
yifu-common/yifu-common-ekp/src/main/resources/ekpSalaryConfig.properties
View file @
8bc1216d
#
ekp.url=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
ekp.url
=
http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
ekp.url
=
http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
#
ekp.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
ekp.fdModelId
=
181d7633ff8bc797276d0d3a54e80ad6
ekp.fdFlowId
=
182b40249c1bc940d7226b941c7a4183
ekp.docStatus
=
20
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @
8bc1216d
...
...
@@ -668,6 +668,12 @@ public class TPaymentInfo extends BaseEntity {
@TableField
(
exist
=
false
)
@ExcelIgnore
private
String
ybSameFlg
;
/**
* 补缴是否导入重复标识
*/
@TableField
(
exist
=
false
)
@ExcelIgnore
private
String
bjSameFlg
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/SocialConstants.java
View file @
8bc1216d
...
...
@@ -21,6 +21,7 @@ public class SocialConstants {
public
static
final
String
BIR
=
"生育"
;
public
static
final
String
GS
=
"工伤"
;
public
static
final
String
YB
=
"医保"
;
public
static
final
String
BJ
=
"补缴"
;
public
static
final
String
YEAR_1970
=
"1970-02"
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
8bc1216d
...
...
@@ -278,7 +278,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
@Override
public
R
<
Boolean
>
removeInFoById
(
String
id
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
String
key
=
user
.
getId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
PAYMENT_SOCIAL_PUSH
;
if
(
Common
.
isNotNull
((
String
)
redisUtil
.
get
(
key
)))
{
return
R
.
failed
(
"用户正在推送实缴数据中禁止删除!"
);
}
TPaymentInfo
paymentInfo
=
baseMapper
.
selectById
(
id
);
if
(!
user
.
getId
().
equals
(
paymentInfo
.
getCreateBy
())
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
user
.
getId
()))
{
return
R
.
failed
(
"非本人创建的数据禁止删除!"
);
...
...
@@ -302,6 +305,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
Common
.
isEmpty
(
ids
))
{
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
}
String
key
=
user
.
getId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
PAYMENT_SOCIAL_PUSH
;
if
(
Common
.
isNotNull
((
String
)
redisUtil
.
get
(
key
)))
{
return
R
.
failed
(
"用户正在推送实缴数据中禁止删除!"
);
}
List
<
String
>
idList
=
Common
.
initStrToList
(
ids
,
CommonConstants
.
COMMA_STRING
);
TPaymentInfo
paymentInfo
;
...
...
@@ -340,12 +348,16 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
String
socialCreateMonth
,
String
socialPayMonth
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
String
key
=
user
.
getId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
PAYMENT_SOCIAL_PUSH
;
if
(
Common
.
isNotNull
((
String
)
redisUtil
.
get
(
key
)))
{
return
R
.
failed
(
"用户正在推送实缴数据中禁止删除!"
);
}
LambdaQueryWrapper
<
TPaymentInfo
>
wrapper
=
buildQueryWrapper
(
empIdCard
,
socialHouseId
,
fundHouseId
,
socialCreateMonth
,
socialPayMonth
);
List
<
TPaymentInfo
>
list
=
baseMapper
.
selectList
(
wrapper
);
List
<
String
>
idList
=
new
ArrayList
<>();
B
oolean
delFlag
=
false
;
b
oolean
delFlag
=
false
;
if
(
Common
.
isNotNull
(
list
))
{
for
(
TPaymentInfo
paymentInfo
:
list
)
{
if
((!
user
.
getId
().
equals
(
paymentInfo
.
getCreateBy
())
&&
...
...
@@ -417,6 +429,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
ConcurrentHashMap
<
String
,
BigDecimal
>
injuryMoneyMap
=
new
ConcurrentHashMap
<>();
//医保
ConcurrentHashMap
<
String
,
BigDecimal
>
medicalMoneyMap
=
new
ConcurrentHashMap
<>();
//补缴利息
ConcurrentHashMap
<
String
,
BigDecimal
>
accrualMoneyMap
=
new
ConcurrentHashMap
<>();
ExcelUtil
<
TPaymentInfoVo
>
util1
=
new
ExcelUtil
<>(
TPaymentInfoVo
.
class
);
// 写法2:
...
...
@@ -466,7 +480,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
private
void
saveData
()
{
log
.
info
(
"{}条数据,开始存储数据库!"
,
cachedDataList
.
size
());
importTPaymentSocialInfo
(
cachedDataList
,
errorMessageList
,
user
,
rowNumber
,
pensionMoneyMap
,
bigMoneyMap
,
unEmpMoneyMap
,
birMoneyMap
,
injuryMoneyMap
,
medicalMoneyMap
);
bigMoneyMap
,
unEmpMoneyMap
,
birMoneyMap
,
injuryMoneyMap
,
medicalMoneyMap
,
accrualMoneyMap
);
log
.
info
(
"存储数据库成功!"
);
}
}).
sheet
().
doRead
();
...
...
@@ -480,6 +494,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
birMoneyMap
.
clear
();
injuryMoneyMap
.
clear
();
medicalMoneyMap
.
clear
();
accrualMoneyMap
.
clear
();
return
R
.
ok
(
errorMessageList
);
}
...
...
@@ -490,7 +505,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
ConcurrentHashMap
<
String
,
BigDecimal
>
unEmpMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
birMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
injuryMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
medicalMoneyMap
)
{
ConcurrentHashMap
<
String
,
BigDecimal
>
medicalMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
accrualMoneyMap
)
{
HashMap
<
String
,
String
>
areaMap
=
new
HashMap
<>();
HashMap
<
String
,
String
>
areaMap2
=
new
HashMap
<>();
R
<
AreaVo
>
areaListR
=
upmsDaprUtils
.
getAreaListR
();
...
...
@@ -538,6 +554,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
ConcurrentHashMap
<
String
,
TPaymentInfo
>
paymentInfoInjuryMap
=
new
ConcurrentHashMap
<>();
//医保
ConcurrentHashMap
<
String
,
TPaymentInfo
>
paymentInfoMedicalMap
=
new
ConcurrentHashMap
<>();
//补缴利息
ConcurrentHashMap
<
String
,
TPaymentInfo
>
paymentInfoaccrualMap
=
new
ConcurrentHashMap
<>();
if
(
Common
.
isNotNull
(
paymentInfos
))
{
for
(
TPaymentInfo
info
:
paymentInfos
)
{
if
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
info
.
getUnitPensionMoney
()),
...
...
@@ -564,6 +582,30 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+
SocialConstants
.
YL
,
info
);
}
if
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
info
.
getCompanyAccrual
()),
BigDecimalUtils
.
isNullToZero
(
info
.
getPersonalAccrual
())).
compareTo
(
BigDecimal
.
ZERO
)
!=
0
)
{
if
(
null
!=
paymentInfoaccrualMap
.
get
(
info
.
getSocialPayAddr
()
+
CommonConstants
.
DOWN_LINE_STRING
+
info
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
info
.
getSocialPayMonth
()
+
CommonConstants
.
DOWN_LINE_STRING
+
info
.
getSocialCreateMonth
()
+
CommonConstants
.
DOWN_LINE_STRING
+
SocialConstants
.
BJ
))
{
info
.
setBjSameFlg
(
"1"
);
}
paymentInfoaccrualMap
.
put
(
info
.
getSocialPayAddr
()
+
CommonConstants
.
DOWN_LINE_STRING
+
info
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
info
.
getSocialPayMonth
()
+
CommonConstants
.
DOWN_LINE_STRING
+
info
.
getSocialCreateMonth
()
+
CommonConstants
.
DOWN_LINE_STRING
+
SocialConstants
.
BJ
,
info
);
}
if
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
info
.
getPersonalBigmailmentMoney
()),
BigDecimalUtils
.
isNullToZero
(
info
.
getUnitBigmailmentMoney
())).
compareTo
(
BigDecimal
.
ZERO
)
!=
0
)
{
if
(
null
!=
paymentInfoBigMap
.
get
(
info
.
getSocialPayAddr
()
...
...
@@ -728,7 +770,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfoPensionMap
,
paymentInfoBigMap
,
paymentInfoBirMap
,
paymentInfoMedicalMap
,
paymentInfoUnEmpMap
,
paymentInfoInjuryMap
,
errorMessageList
,
pensionMoneyMap
,
bigMoneyMap
,
unEmpMoneyMap
,
birMoneyMap
,
injuryMoneyMap
,
medicalMoneyMap
),
yfSocialImportThreadPoolExecutor
);
injuryMoneyMap
,
medicalMoneyMap
,
accrualMoneyMap
,
paymentInfoaccrualMap
),
yfSocialImportThreadPoolExecutor
);
completableFutureList
.
add
(
listCompletableFuture
);
}
...
...
@@ -742,7 +785,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfoPensionMap
,
paymentInfoBigMap
,
paymentInfoBirMap
,
paymentInfoMedicalMap
,
paymentInfoUnEmpMap
,
paymentInfoInjuryMap
,
errorMessageList
,
pensionMoneyMap
,
bigMoneyMap
,
unEmpMoneyMap
,
birMoneyMap
,
injuryMoneyMap
,
medicalMoneyMap
),
yfSocialImportThreadPoolExecutor
);
injuryMoneyMap
,
medicalMoneyMap
,
accrualMoneyMap
,
paymentInfoaccrualMap
),
yfSocialImportThreadPoolExecutor
);
completableFutureList
.
add
(
listCompletableFuture
);
lastIdx
=
1
;
...
...
@@ -757,7 +801,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfoPensionMap
,
paymentInfoBigMap
,
paymentInfoBirMap
,
paymentInfoMedicalMap
,
paymentInfoUnEmpMap
,
paymentInfoInjuryMap
,
errorMessageList
,
pensionMoneyMap
,
bigMoneyMap
,
unEmpMoneyMap
,
birMoneyMap
,
injuryMoneyMap
,
medicalMoneyMap
),
yfSocialImportThreadPoolExecutor
);
injuryMoneyMap
,
medicalMoneyMap
,
accrualMoneyMap
,
paymentInfoaccrualMap
),
yfSocialImportThreadPoolExecutor
);
tempList
=
new
ArrayList
<>();
}
}
...
...
@@ -782,7 +827,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfoPensionMap
,
paymentInfoBigMap
,
paymentInfoBirMap
,
paymentInfoMedicalMap
,
paymentInfoUnEmpMap
,
paymentInfoInjuryMap
,
errorMessageList
,
pensionMoneyMap
,
bigMoneyMap
,
unEmpMoneyMap
,
birMoneyMap
,
injuryMoneyMap
,
medicalMoneyMap
),
yfSocialImportThreadPoolExecutor
);
injuryMoneyMap
,
medicalMoneyMap
,
accrualMoneyMap
,
paymentInfoaccrualMap
),
yfSocialImportThreadPoolExecutor
);
completableFutureList
.
add
(
listCompletableFuture
);
}
// 阻塞当前线程,等待所有的线程执行完毕
...
...
@@ -862,7 +908,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
ConcurrentHashMap
<
String
,
BigDecimal
>
unEmpMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
birMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
injuryMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
medicalMoneyMap
)
{
ConcurrentHashMap
<
String
,
BigDecimal
>
medicalMoneyMap
,
ConcurrentHashMap
<
String
,
BigDecimal
>
accrualMoneyMap
,
ConcurrentHashMap
<
String
,
TPaymentInfo
>
paymentInfoaccrualMap
)
{
if
(
Common
.
isNotNull
(
list
))
{
TPaymentInfo
paymentInfo
;
TSocialFundInfo
socialInfo
;
...
...
@@ -941,6 +989,19 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
pensionMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitPensionMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalPensionMoney
())));
}
//补缴
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
SocialConstants
.
BJ
));
if
(
accrualMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalAccrual
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getCompanyAccrual
())),
accrualMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
SocialConstants
.
ERROR_TEMPLATE
+
infoVo
.
getEmpIdcard
()
+
"的补缴缴费数据"
));
continue
;
}
else
{
accrualMoneyMap
.
put
(
exitMoney
,
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalAccrual
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getCompanyAccrual
())));
}
//医疗
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
SocialConstants
.
YB
));
if
(
medicalMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
...
...
@@ -1027,6 +1088,31 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
//判断是否存在补缴缴费数据
if
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalAccrual
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getCompanyAccrual
())).
compareTo
(
BigDecimal
.
ZERO
)
!=
0
)
{
paymentInfo
=
paymentInfoaccrualMap
.
get
(
infoVo
.
getSocialPayAddr
()
+
CommonConstants
.
DOWN_LINE_STRING
+
infoVo
.
getEmpIdcard
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
infoVo
.
getSocialPayMonth
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
infoVo
.
getSocialCreateMonth
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
SocialConstants
.
BJ
);
//存在社保缴费数据
if
(
null
!=
paymentInfo
&&
((
null
!=
paymentInfo
.
getBjSameFlg
()
&&
CommonConstants
.
ONE_STRING
.
equals
(
paymentInfo
.
getBjSameFlg
()))
||
(
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalAccrual
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getCompanyAccrual
())),
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getPersonalAccrual
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getCompanyAccrual
()))).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)))
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的补缴缴费数据,请勿重复导入!"
));
continue
;
}
}
//判断是否存在失业缴费数据
if
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitUnemploymentMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalUnemploymentMoney
())).
compareTo
(
BigDecimal
.
ZERO
)
!=
0
)
{
...
...
@@ -1797,6 +1883,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
redisUtil
.
set
(
sumNumKey
,
bfInt
,
360L
);
}
else
{
maerialRatio
=
"100"
;
redisUtil
.
remove
(
sumNumKey
);
}
}
redisUtil
.
set
(
importSuccessKey
,
maerialRatio
,
360L
);
...
...
@@ -1962,7 +2049,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//判断是否存在养老缴费数据
if
(
PaymentConstants
.
PENSION_RISK
.
equals
(
infoVo
.
getRiskType
()))
{
//导入模板判重 养老
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
SocialConstants
.
YL
));
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
PaymentConstants
.
PENSION_RISK
));
if
(
pensionMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitMoney
())),
pensionMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
...
...
@@ -1999,7 +2086,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//判断是否存在失业缴费数据
if
(
PaymentConstants
.
UNEMPLOYEEMENT_RISK
.
equals
(
infoVo
.
getRiskType
()))
{
//导入模板判重 失业
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
SocialConstants
.
SY
));
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
PaymentConstants
.
UNEMPLOYEEMENT_RISK
));
if
(
unEmpMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalMoney
())),
unEmpMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
...
...
@@ -2037,7 +2124,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//判断是否存在医保缴费数据
if
(
CommonConstants
.
ONE_STRING
.
equals
(
type
))
{
//导入模板判重 医疗
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
SocialConstants
.
YB
));
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
PaymentConstants
.
MEDICAL
));
if
(
medicalMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitMedicalMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalMedicalMoney
())),
medicalMoneyMap
.
get
(
exitMoney
)).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
...
...
@@ -2076,7 +2163,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//判断是否存在工伤缴费数据
if
(
PaymentConstants
.
INJURY_RISK
.
equals
(
infoVo
.
getRiskType
()))
{
//导入模板判重 工伤
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
SocialConstants
.
GS
));
exitMoney
=
infoVo
.
getEmpIdcard
().
concat
(
infoVo
.
getSocialPayMonth
().
concat
(
infoVo
.
getSocialCreateMonth
()).
concat
(
PaymentConstants
.
INJURY_RISK
));
if
(
injuryMoneyMap
.
get
(
exitMoney
)
!=
null
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getPersonalMoney
()),
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitMoney
())),
...
...
@@ -2429,12 +2516,20 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
@Override
public
void
pushPaymentSocialFundInfo
()
{
YifuUser
user
=
SecurityUtils
.
getUser
();
//手动推送未推送的社保公积金明细数据
createPaymentSocialInfoReal
(
user
);
createPaymentFundInfoReal
(
user
);
//推送社保公积金收入数据
createPaymentInfoIncomeReal
(
user
);
createPaymentFundIncomeReal
(
user
);
String
key
=
user
.
getId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
PAYMENT_SOCIAL_PUSH
;
redisUtil
.
set
(
key
,
user
.
getId
(),
36000L
);
try
{
//手动推送未推送的社保公积金明细数据
createPaymentSocialInfoReal
(
user
);
createPaymentFundInfoReal
(
user
);
//推送社保公积金收入数据
createPaymentInfoIncomeReal
(
user
);
createPaymentFundIncomeReal
(
user
);
redisUtil
.
remove
(
key
);
}
catch
(
Exception
e
)
{
log
.
error
(
"社保缴费库:"
+
e
);
redisUtil
.
remove
(
key
);
}
}
@Override
...
...
@@ -2745,6 +2840,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
else
{
socialParam
.
setFd_3af9ee3d0ba3b6
(
CommonConstants
.
EMPTY_STRING
);
}
//创建人姓名
if
(
Common
.
isNotNull
(
library
.
getCreateName
()))
{
socialParam
.
setFd_3b438e33f37378
(
library
.
getCreateName
());
}
else
{
socialParam
.
setFd_3b438e33f37378
(
CommonConstants
.
EMPTY_STRING
);
}
//我司到款单位
socialParam
.
setFd_3b01953871b8be
(
CommonConstants
.
EMPTY_STRING
);
//社保id
...
...
@@ -2923,6 +3024,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
fundParam
.
setFd_3b0afbaf10df2c
(
library
.
getId
());
// 薪酬申请编号
fundParam
.
setFd_3b3cabde83d1d0
(
CommonConstants
.
EMPTY_STRING
);
//创建人姓名
if
(
Common
.
isNotNull
(
library
.
getCreateName
()))
{
fundParam
.
setFd_3b43922217c6f8
(
library
.
getCreateName
());
}
else
{
fundParam
.
setFd_3b43922217c6f8
(
CommonConstants
.
EMPTY_STRING
);
}
String
body
=
ekpFundUtil
.
sendToEKP
(
fundParam
);
if
(
Common
.
isNotNull
(
body
)
&&
body
.
length
()
==
32
)
{
//更新推送状态为已推送的列表
...
...
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