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
e51f17fc
Commit
e51f17fc
authored
Oct 24, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
派单校验修改
parent
0f1f7abb
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
96 additions
and
146 deletions
+96
-146
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+96
-146
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
e51f17fc
...
...
@@ -608,7 +608,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
for
(
int
i
=
lastIdx
+
1
;
i
<
list
.
size
();
i
++)
{
tempList
.
add
(
list
.
get
(
i
));
}
lastIdx
+=
1
;
}
List
<
TPaymentInfoVo
>
finalTempList
=
tempList
;
...
...
@@ -698,7 +697,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
ConcurrentHashMap
<
String
,
TPaymentInfo
>
paymentInfoInjuryMap
,
List
<
ErrorMessage
>
errorMessageList
)
{
if
(
Common
.
isNotNull
(
list
))
{
TPaymentInfo
paymentInfo
=
null
;
TPaymentInfo
paymentInfo
;
TSocialFundInfo
socialInfo
;
TSocialInfo
tSocialInfo
;
String
temp
;
...
...
@@ -782,7 +781,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+
infoVo
.
getSocialCreateMonth
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
SocialConstants
.
YL
);
}
//存在社保缴费数据
if
(
null
!=
paymentInfo
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitPensionMoney
()),
...
...
@@ -792,8 +791,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的养老缴费数据,请勿重复导入!"
));
continue
;
}
else
{
paymentInfo
=
null
;
}
}
//判断是否存在失业缴费数据
...
...
@@ -808,7 +806,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+
infoVo
.
getSocialCreateMonth
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
SocialConstants
.
SY
);
}
//存在社保缴费数据
if
(
null
!=
paymentInfo
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitUnemploymentMoney
()),
...
...
@@ -818,8 +815,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的失业缴费数据,请勿重复导入!"
));
continue
;
}
else
{
paymentInfo
=
null
;
}
}
//判断是否存在医保缴费数据
...
...
@@ -834,7 +830,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+
infoVo
.
getSocialCreateMonth
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
SocialConstants
.
YB
);
}
//存在社保缴费数据
if
(
null
!=
paymentInfo
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitMedicalMoney
()),
...
...
@@ -844,8 +840,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的医保缴费数据,请勿重复导入!"
));
continue
;
}
else
{
paymentInfo
=
null
;
}
}
//判断是否存在医疗救助金缴费数据
...
...
@@ -860,7 +855,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+
infoVo
.
getSocialCreateMonth
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
SocialConstants
.
DB
);
}
//存在社保缴费数据
if
(
null
!=
paymentInfo
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
safeAdd
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitBigmailmentMoney
()),
...
...
@@ -870,8 +864,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的医疗救助金缴费数据,请勿重复导入!"
));
continue
;
}
else
{
paymentInfo
=
null
;
}
}
//判断是否存在工伤缴费数据
...
...
@@ -885,15 +878,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+
infoVo
.
getSocialCreateMonth
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
SocialConstants
.
GS
);
}
//存在社保缴费数据
if
(
null
!=
paymentInfo
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitInjuryMoney
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitInjuryMoney
())).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的单位工伤缴费数据,请勿重复导入!"
));
continue
;
}
else
{
paymentInfo
=
null
;
}
}
//判断是否存在生育缴费数据
...
...
@@ -907,7 +898,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+
infoVo
.
getSocialCreateMonth
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
SocialConstants
.
BIR
);
}
//存在社保缴费数据
if
(
null
!=
paymentInfo
&&
BigDecimalUtils
.
safeMultiply
(
BigDecimalUtils
.
isNullToZero
(
infoVo
.
getUnitBirthMoney
()),
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitBirthMoney
())).
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
...
...
@@ -915,6 +905,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+
"的单位生育缴费数据,请勿重复导入!"
));
continue
;
}
}
tSocialInfo
=
socialInfoMapper
.
selectOne
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
()).
groupBy
(
TSocialInfo:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
...
...
@@ -936,8 +927,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo
.
setSocialProvince
(
socialInfo
.
getSocialProvince
());
paymentInfo
.
setSocialCity
(
socialInfo
.
getSocialCity
());
paymentInfo
.
setSocialTown
(
socialInfo
.
getSocialTown
());
paymentInfo
.
setSocialHousehold
(
socialInfo
.
getSocialHouseholdName
());
paymentInfo
.
setSocialPayMonth
(
infoVo
.
getSocialPayMonth
());
...
...
@@ -1005,22 +994,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo
.
setSumAll
(
paymentInfo
.
getSocialSum
());
paymentInfo
.
setCreateBy
(
user
.
getId
());
paymentInfo
.
setCreateName
(
user
.
getNickname
());
if
(
Common
.
isEmpty
(
paymentInfo
.
getSocialId
()))
{
paymentInfo
.
setSocialId
(
UUID
.
randomUUID
().
toString
());
}
if
(
Common
.
isNotNull
(
paymentInfo
.
getId
()))
{
res
=
baseMapper
.
updateById
(
paymentInfo
);
if
(
res
<
0
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
infoVo
.
getEmpName
()
+
"_缴费库更新失败!"
));
}
}
else
{
res
=
insertAndSTimestamp
(
paymentInfo
);
if
(
res
<
0
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
infoVo
.
getEmpName
()
+
"_缴费库保存失败!"
));
}
}
}
}
return
errorMessageList
;
}
...
...
@@ -1289,7 +1269,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
infoVo
.
getEmpName
()
+
CommonConstants
.
DOWN_LINE_STRING
+
infoVo
.
getEmpIdcard
()
+
"公积金缴费数据,禁止覆盖!"
));
continue
;
}
TProvidentFund
tProvidentFund
=
providentFundMapper
.
selectOne
(
Wrappers
.<
TProvidentFund
>
query
().
lambda
()
...
...
@@ -1345,24 +1324,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo
.
setUnitProvidentSum
(
null
==
infoVo
.
getUnitProvidentSum
()
?
BigDecimal
.
ZERO
:
infoVo
.
getUnitProvidentSum
());
paymentInfo
.
setProvidentSum
(
null
==
infoVo
.
getProvidentSum
()
?
BigDecimal
.
ZERO
:
infoVo
.
getProvidentSum
());
paymentInfo
.
setSumAll
(
paymentInfo
.
getProvidentSum
());
if
(
Common
.
isEmpty
(
paymentInfo
.
getFundId
()))
{
paymentInfo
.
setFundId
(
UUID
.
randomUUID
().
toString
());
}
if
(
Common
.
isNotNull
(
paymentInfo
.
getId
()))
{
res
=
baseMapper
.
updateById
(
paymentInfo
);
if
(
res
<
0
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
infoVo
.
getEmpName
()
+
infoVo
.
getEmpName
()
+
"_缴费库覆盖更新失败!"
));
continue
;
}
}
else
{
res
=
insertAndSTimestamp
(
paymentInfo
);
if
(
res
<
0
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
infoVo
.
getEmpName
()
+
"_缴费库保存失败!"
));
continue
;
}
}
if
(
Common
.
isNotNull
(
paymentInfo
.
getId
())
&&
Common
.
isNotNull
(
paymentInfo
.
getFundId
()))
{
paymentInfoMap
.
put
(
paymentInfo
.
getProvidentPayAddr
()
+
CommonConstants
.
DOWN_LINE_STRING
...
...
@@ -1580,7 +1548,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
for
(
int
i
=
lastIdx
+
1
;
i
<
list
.
size
();
i
++)
{
tempList
.
add
(
list
.
get
(
i
));
}
lastIdx
+=
1
;
}
List
<
TPaymentHeFeiVo
>
finalTempList
=
tempList
;
...
...
@@ -1621,8 +1588,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
ConcurrentHashMap
<
String
,
TPaymentInfo
>
paymentInfoBigMap
,
String
type
,
List
<
ErrorMessage
>
errorMessageList
)
{
if
(
Common
.
isNotNull
(
list
))
{
TPaymentInfo
payExists
=
null
;
TPaymentInfo
payExists
;
TSocialFundInfo
socialInfo
=
null
;
TSocialInfo
tSocialInfo
;
String
temp
;
int
res
=
-
1
;
...
...
@@ -1632,12 +1600,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//已存在的社保数据
HashMap
<
String
,
TSocialFundInfo
>
socialMap
=
new
HashMap
<>();
if
(
Common
.
isNotNull
(
socialInfoList
))
{
for
(
TSocialFundInfo
tSocialInfo
:
socialInfoList
)
{
socialMap
.
put
(
tSocialInfo
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
tSocialInfo
.
getSocialProvince
()
+
CommonConstants
.
DOWN_LINE_STRING
+
tSocialInfo
.
getSocialCity
()
+
CommonConstants
.
DOWN_LINE_STRING
+
(
null
==
tSocialInfo
.
getSocialTown
()
?
"null"
:
tSocialInfo
.
getSocialTown
()),
tSocialInfo
);
for
(
TSocialFundInfo
tSocialInfo
1
:
socialInfoList
)
{
socialMap
.
put
(
tSocialInfo
1
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
tSocialInfo
1
.
getSocialProvince
()
+
CommonConstants
.
DOWN_LINE_STRING
+
tSocialInfo
1
.
getSocialCity
()
+
CommonConstants
.
DOWN_LINE_STRING
+
(
null
==
tSocialInfo
1
.
getSocialTown
()
?
"null"
:
tSocialInfo
1
.
getSocialTown
()),
tSocialInfo1
);
}
}
...
...
@@ -1704,8 +1672,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的养老缴费数据,请勿重复导入!"
));
continue
;
}
else
{
payExists
=
null
;
}
}
...
...
@@ -1729,8 +1695,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的失业缴费数据,请勿重复导入!"
));
continue
;
}
else
{
payExists
=
null
;
}
}
...
...
@@ -1755,8 +1719,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的医保缴费数据,请勿重复导入!"
));
continue
;
}
else
{
payExists
=
null
;
}
}
...
...
@@ -1780,8 +1742,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的单位工伤缴费数据,请勿重复导入!"
));
continue
;
}
else
{
payExists
=
null
;
}
}
...
...
@@ -1806,15 +1766,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
infoVo
.
getEmpIdcard
()
+
"的医疗救助金缴费数据,请勿重复导入!"
));
continue
;
}
else
{
payExists
=
null
;
}
}
TSocialInfo
tSocialInfo
=
socialInfoMapper
.
selectOne
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
tSocialInfo
=
socialInfoMapper
.
selectOne
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
()).
groupBy
(
TSocialInfo:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
null
==
payExists
)
{
payExists
=
new
TPaymentInfo
();
payExists
.
setLockStatus
(
CommonConstants
.
ZERO_STRING
);
payExists
.
setEmpId
(
socialInfo
.
getEmpId
());
...
...
@@ -1829,7 +1787,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists
.
setInauguralTeam
(
tSocialInfo
.
getInauguralTeam
());
payExists
.
setEmpNo
(
tSocialInfo
.
getEmpNo
());
}
}
payExists
.
setSocialProvince
(
socialInfo
.
getSocialProvince
());
payExists
.
setSocialCity
(
socialInfo
.
getSocialCity
());
payExists
.
setSocialTown
(
socialInfo
.
getSocialTown
());
...
...
@@ -1900,22 +1858,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists
.
setSumAll
(
payExists
.
getSocialSum
());
payExists
.
setCreateBy
(
user
.
getId
());
payExists
.
setCreateName
(
user
.
getNickname
());
if
(
Common
.
isEmpty
(
payExists
.
getSocialId
()))
{
payExists
.
setSocialId
(
UUID
.
randomUUID
().
toString
());
}
if
(
Common
.
isNotNull
(
payExists
.
getId
()))
{
res
=
baseMapper
.
updateById
(
payExists
);
if
(
res
<
0
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
infoVo
.
getEmpIdcard
()
+
"_缴费库更新失败!"
));
}
}
else
{
res
=
insertAndSTimestamp
(
payExists
);
if
(
res
<
0
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
infoVo
.
getEmpIdcard
()
+
"_缴费库保存失败!"
));
}
}
}
}
return
errorMessageList
;
}
...
...
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