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
3830ca72
Commit
3830ca72
authored
Sep 20, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.10' into MVP1.6.10
parents
ba4debec
c61e5409
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
24 deletions
+4
-24
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+1
-1
IcbcTransactionFlowQueryServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
+3
-2
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+0
-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 @
3830ca72
...
...
@@ -627,6 +627,6 @@ public interface CommonConstants {
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
());
List
<
String
>
socialInfoStatus
=
Stream
.
of
(
"1"
,
"
3"
,
"
5"
,
"7"
).
collect
(
Collectors
.
toList
());
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
View file @
3830ca72
...
...
@@ -140,8 +140,9 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
bizContent
.
setLanguage
(
"zh_CN"
);
String
fSeqNo
=
"AHWX"
+
System
.
currentTimeMillis
();
bizContent
.
setfSeqno
(
fSeqNo
);
bizContent
.
setAccountNo
(
"1302010109024596014"
);
bizContent
.
setBeginDate
(
DateUtil
.
getThisDay
());
bizContent
.
setAccountNo
(
"1302015209250019444"
);
bizContent
.
setBeginDate
(
DateUtil
.
addDay
(-
10
).
replace
(
"-"
,
""
));
bizContent
.
setEndDate
(
DateUtil
.
getThisDay
());
bizContent
.
setDrcrf
(
"2"
);
request
.
setServiceUrl
(
icbcConfigProperties
.
getServerUrl
());
request
.
setBizContent
(
bizContent
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
3830ca72
...
...
@@ -138,8 +138,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private
final
TDispatchSocialFundInfoService
infoService
;
private
final
SysHouseHoldInfoMapper
houseHoldInfoMapper
;
/**
* 派单信息记录表简单分页查询
*
...
...
@@ -3942,7 +3940,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
boolean
auditFlag
=
true
;
boolean
partSuccess
=
false
;
TDispatchSocialFundInfo
socialFundInfo
;
SysHouseHoldInfo
info
;
for
(
TDispatchInfo
dis
:
disList
)
{
auditFlag
=
true
;
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
typeSub
))
{
...
...
@@ -4025,15 +4022,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 社保办理状态补充判断:
this
.
setSocialHandleStatus
(
handleStatus
,
socialType
,
flag
,
socialInfo
,
dis
,
sf
,
isAutoHandle
);
info
=
houseHoldInfoMapper
.
selectOne
(
Wrappers
.<
SysHouseHoldInfo
>
query
().
lambda
()
.
eq
(
SysHouseHoldInfo:
:
getType
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysHouseHoldInfo:
:
getName
,
dis
.
getSocialHouseholdName
())
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
sf
.
setSocialHouseholdName
(
dis
.
getSocialHouseholdName
());
sf
.
setSocialHousehold
(
info
==
null
?
""
:
info
.
getId
());
sf
.
setSocialProvince
(
dis
.
getSocialProvince
());
sf
.
setSocialCity
(
dis
.
getSocialCity
());
sf
.
setSocialTown
(
dis
.
getSocialTown
());
socialMapper
.
updateById
(
socialInfo
);
dis
.
setSocialHandleRemark
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
...
...
@@ -4129,15 +4117,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 社保办理状态补充判断:
this
.
setSocialHandleStatus
(
handleStatus
,
socialType
,
flag
,
socialInfo
,
dis
,
sf
,
isAutoHandle
);
info
=
houseHoldInfoMapper
.
selectOne
(
Wrappers
.<
SysHouseHoldInfo
>
query
().
lambda
()
.
eq
(
SysHouseHoldInfo:
:
getType
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysHouseHoldInfo:
:
getName
,
dis
.
getSocialHouseholdName
())
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
sf
.
setSocialHouseholdName
(
dis
.
getSocialHouseholdName
());
sf
.
setSocialHousehold
(
info
==
null
?
""
:
info
.
getId
());
sf
.
setSocialProvince
(
dis
.
getSocialProvince
());
sf
.
setSocialCity
(
dis
.
getSocialCity
());
sf
.
setSocialTown
(
dis
.
getSocialTown
());
socialInfo
.
setReduceHandleUser
(
user
.
getId
());
socialInfo
.
setReduceHandleTime
(
now
);
//社保派减办理成功才变更社保的办理状态
...
...
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