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
13d83b68
Commit
13d83b68
authored
Sep 18, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-实缴导入逻辑修改
parent
9e5fc81d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
21 deletions
+20
-21
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+7
-0
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+13
-21
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
13d83b68
...
...
@@ -17,6 +17,9 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
common
.
core
.
constant
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
/**
* @author lengleng
...
...
@@ -622,4 +625,8 @@ public interface CommonConstants {
Integer
TEN_INTEGER
=
10
;
Integer
ELEVEN_INTEGER
=
11
;
List
<
String
>
socialStatus
=
Stream
.
of
(
"3"
,
"4"
,
"6"
,
"7"
,
"9"
,
"11"
,
"12"
).
collect
(
Collectors
.
toList
());
List
<
String
>
socialInfoStatus
=
Stream
.
of
(
"1"
,
"5"
,
"7"
).
collect
(
Collectors
.
toList
());
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
13d83b68
...
...
@@ -1154,8 +1154,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
List
<
TSocialInfo
>
socialist
;
TSettleDomain
domain
;
List
<
TSocialFundInfo
>
socialInfoList
=
socialFundInfoMapper
.
selectList
(
Wrappers
.<
TSocialFundInfo
>
query
().
lambda
()
.
in
(
TSocialFundInfo:
:
getEmpIdcard
,
Common
.
listObjectToStrList
(
list
,
ExcelAttributeConstants
.
EMPIDCARD
)));
.
in
(
TSocialFundInfo:
:
getEmpIdcard
,
Common
.
listObjectToStrList
(
list
,
ExcelAttributeConstants
.
EMPIDCARD
))
.
in
(
TSocialFundInfo:
:
getSocialStatus
,
CommonConstants
.
socialStatus
));
//已存在的社保数据
HashMap
<
String
,
TSocialFundInfo
>
socialMap
=
new
HashMap
<>();
...
...
@@ -1214,12 +1216,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
())
.
eq
(
TSocialInfo:
:
getSocialProvince
,
infoVo
.
getSocialProvince
())
.
eq
(
TSocialInfo:
:
getSocialCity
,
infoVo
.
getSocialCity
())
.
and
(
obj
->
obj
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
ONE_STRING
)
.
or
()
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
FIVE_STRING
)
.
or
()
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
SEVEN_STRING
)
)
.
in
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
socialInfoStatus
)
);
if
(
CollectionUtils
.
isNotEmpty
(
socialist
))
{
for
(
TSocialInfo
socialInfo1
:
socialist
)
{
...
...
@@ -1492,6 +1489,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
Common
.
isEmpty
(
tSocialInfo
))
{
tSocialInfo
=
socialInfoMapper
.
selectOne
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
()).
groupBy
(
TSocialInfo:
:
getCreateTime
)
.
in
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
socialInfoStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
...
...
@@ -2827,7 +2825,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
TSettleDomain
domain
;
List
<
TSocialFundInfo
>
socialInfoList
=
socialFundInfoMapper
.
selectList
(
Wrappers
.<
TSocialFundInfo
>
query
().
lambda
()
.
in
(
TSocialFundInfo:
:
getEmpIdcard
,
Common
.
listObjectToStrList
(
list
,
ExcelAttributeConstants
.
EMPIDCARD
)));
.
in
(
TSocialFundInfo:
:
getEmpIdcard
,
Common
.
listObjectToStrList
(
list
,
ExcelAttributeConstants
.
EMPIDCARD
))
.
in
(
TSocialFundInfo:
:
getSocialStatus
,
CommonConstants
.
socialStatus
));
//已存在的社保数据
HashMap
<
String
,
TSocialFundInfo
>
socialMap
=
new
HashMap
<>();
...
...
@@ -2882,12 +2881,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
())
.
eq
(
TSocialInfo:
:
getSocialProvince
,
infoVo
.
getSocialProvince
().
toString
())
.
eq
(
TSocialInfo:
:
getSocialCity
,
infoVo
.
getSocialCity
().
toString
())
.
and
(
obj
->
obj
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
ONE_STRING
)
.
or
()
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
FIVE_STRING
)
.
or
()
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
SEVEN_STRING
)
)
.
in
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
socialInfoStatus
)
);
if
(
CollectionUtils
.
isNotEmpty
(
socialist
))
{
for
(
TSocialInfo
socialInfo1
:
socialist
)
{
...
...
@@ -3107,6 +3101,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
Common
.
isEmpty
(
tSocialInfo
))
{
tSocialInfo
=
socialInfoMapper
.
selectOne
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
()).
groupBy
(
TSocialInfo:
:
getCreateTime
)
.
in
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
socialInfoStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
...
...
@@ -3300,7 +3295,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
TSettleDomain
domain
;
List
<
TSocialFundInfo
>
socialInfoList
=
socialFundInfoMapper
.
selectList
(
Wrappers
.<
TSocialFundInfo
>
query
().
lambda
()
.
in
(
TSocialFundInfo:
:
getEmpIdcard
,
Common
.
listObjectToStrList
(
list
,
ExcelAttributeConstants
.
EMPIDCARD
)));
.
in
(
TSocialFundInfo:
:
getEmpIdcard
,
Common
.
listObjectToStrList
(
list
,
ExcelAttributeConstants
.
EMPIDCARD
))
.
in
(
TSocialFundInfo:
:
getSocialStatus
,
CommonConstants
.
socialStatus
));
//已存在的社保数据
HashMap
<
String
,
TSocialFundInfo
>
socialMap
=
new
HashMap
<>();
...
...
@@ -3357,12 +3353,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
())
.
eq
(
TSocialInfo:
:
getSocialProvince
,
infoVo
.
getSocialProvince
().
toString
())
.
eq
(
TSocialInfo:
:
getSocialCity
,
infoVo
.
getSocialCity
().
toString
())
.
and
(
obj
->
obj
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
ONE_STRING
)
.
or
()
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
FIVE_STRING
)
.
or
()
.
eq
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
SEVEN_STRING
)
));
.
in
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
socialInfoStatus
));
if
(
CollectionUtils
.
isNotEmpty
(
socialist
))
{
for
(
TSocialInfo
socialInfo1
:
socialist
)
{
if
((
Common
.
isEmpty
(
infoVo
.
getSocialTown
())
||
(
Common
.
isNotNull
(
infoVo
.
getSocialTown
())
&&
...
...
@@ -3389,6 +3380,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if
(
Common
.
isEmpty
(
tSocialInfo
))
{
tSocialInfo
=
socialInfoMapper
.
selectOne
(
Wrappers
.<
TSocialInfo
>
query
().
lambda
()
.
eq
(
TSocialInfo:
:
getEmpIdcard
,
infoVo
.
getEmpIdcard
()).
groupBy
(
TSocialInfo:
:
getCreateTime
)
.
in
(
TSocialInfo:
:
getHandleStatus
,
CommonConstants
.
socialInfoStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
...
...
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