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
9e5fc81d
Commit
9e5fc81d
authored
Sep 14, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-实缴导入逻辑修改
parent
0906b3e6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
0 deletions
+25
-0
TSocialFundInfo.java
...ifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
+1
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+24
-0
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @
9e5fc81d
...
@@ -227,6 +227,7 @@ public class TSocialFundInfo extends BaseEntity {
...
@@ -227,6 +227,7 @@ public class TSocialFundInfo extends BaseEntity {
@Schema
(
description
=
"缴纳地-县"
)
@Schema
(
description
=
"缴纳地-县"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"缴纳地-县"
)
@ExcelProperty
(
"缴纳地-县"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
socialTown
;
private
String
socialTown
;
/**
/**
* 公积金户
* 公积金户
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
9e5fc81d
...
@@ -138,6 +138,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -138,6 +138,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private
final
TDispatchSocialFundInfoService
infoService
;
private
final
TDispatchSocialFundInfoService
infoService
;
private
final
SysHouseHoldInfoMapper
houseHoldInfoMapper
;
/**
/**
* 派单信息记录表简单分页查询
* 派单信息记录表简单分页查询
*
*
...
@@ -3940,6 +3942,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3940,6 +3942,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
boolean
auditFlag
=
true
;
boolean
auditFlag
=
true
;
boolean
partSuccess
=
false
;
boolean
partSuccess
=
false
;
TDispatchSocialFundInfo
socialFundInfo
;
TDispatchSocialFundInfo
socialFundInfo
;
SysHouseHoldInfo
info
;
for
(
TDispatchInfo
dis
:
disList
)
{
for
(
TDispatchInfo
dis
:
disList
)
{
auditFlag
=
true
;
auditFlag
=
true
;
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
typeSub
))
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
typeSub
))
{
...
@@ -4022,6 +4025,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4022,6 +4025,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 社保办理状态补充判断:
// 社保办理状态补充判断:
this
.
setSocialHandleStatus
(
handleStatus
,
socialType
,
flag
,
socialInfo
,
dis
,
sf
,
isAutoHandle
);
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
);
socialMapper
.
updateById
(
socialInfo
);
dis
.
setSocialHandleRemark
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
dis
.
setSocialHandleRemark
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
...
@@ -4116,6 +4128,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4116,6 +4128,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
socialInfo
)
&&
Common
.
isNotNull
(
socialInfo
.
getId
()))
{
if
(
Common
.
isNotNull
(
socialInfo
)
&&
Common
.
isNotNull
(
socialInfo
.
getId
()))
{
// 社保办理状态补充判断:
// 社保办理状态补充判断:
this
.
setSocialHandleStatus
(
handleStatus
,
socialType
,
flag
,
socialInfo
,
dis
,
sf
,
isAutoHandle
);
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
.
setReduceHandleUser
(
user
.
getId
());
socialInfo
.
setReduceHandleTime
(
now
);
socialInfo
.
setReduceHandleTime
(
now
);
//社保派减办理成功才变更社保的办理状态
//社保派减办理成功才变更社保的办理状态
...
@@ -4249,6 +4271,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4249,6 +4271,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
auditInfoMapper
.
insert
(
auditInfo
);
auditInfoMapper
.
insert
(
auditInfo
);
}
}
baseMapper
.
updateById
(
dis
);
baseMapper
.
updateById
(
dis
);
//v1.8.9更新社保公积金缴纳地和户数据
socialFundMapper
.
updateById
(
sf
);
socialFundMapper
.
updateById
(
sf
);
//派减的申请审核完更新社保公积金查询快照表
//派减的申请审核完更新社保公积金查询快照表
if
(
CommonConstants
.
ONE_STRING
.
equals
(
dis
.
getType
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
dis
.
getType
()))
{
...
...
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