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
540fede7
Commit
540fede7
authored
Aug 21, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.14' into MVP1.7.14
parents
0cb205b2
d3155218
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
2 deletions
+21
-2
TSocialFundInfo.java
...ifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
+10
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+9
-1
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+2
-1
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @
540fede7
...
@@ -1231,6 +1231,16 @@ public class TSocialFundInfo extends BaseEntity {
...
@@ -1231,6 +1231,16 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty
(
"派单ID"
)
@ExcelProperty
(
"派单ID"
)
private
String
dispatchId
;
private
String
dispatchId
;
/**
* 社保ID(取值最新办理成功的社保ID)
*/
@Length
(
max
=
32
,
message
=
"社保ID(取值最新办理成功的社保ID) 不能超过32个字符"
)
@ExcelAttribute
(
name
=
"社保ID(取值最新办理成功的社保ID)"
,
maxLength
=
32
)
@Schema
(
description
=
"社保ID(取值最新办理成功的社保ID)"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保ID(取值最新办理成功的社保ID)"
)
private
String
socialIdSuccess
;
// 执行月份,整体调基使用的
// 执行月份,整体调基使用的
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
doMonth
;
private
String
doMonth
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
540fede7
...
@@ -3665,6 +3665,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3665,6 +3665,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo
.
setDeleteFlag
(
CommonConstants
.
ONE_STRING
);
socialInfo
.
setDeleteFlag
(
CommonConstants
.
ONE_STRING
);
sf
.
setSocialAddStatus
(
CommonConstants
.
FIVE_STRING
);
sf
.
setSocialAddStatus
(
CommonConstants
.
FIVE_STRING
);
sf
.
setSocialStatus
(
CommonConstants
.
TEN_STRING
);
sf
.
setSocialStatus
(
CommonConstants
.
TEN_STRING
);
//如果是部分办理失败的恢复最新的socialId ,避免后面派减取值问题
if
(
null
!=
sf
.
getSocialIdSuccess
()){
sf
.
setSocialId
(
sf
.
getSocialIdSuccess
());
}
}
}
socialInfo
.
setAuditTime
(
now
);
socialInfo
.
setAuditTime
(
now
);
socialInfo
.
setAuditUser
(
user
.
getId
());
socialInfo
.
setAuditUser
(
user
.
getId
());
...
@@ -4318,7 +4323,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -4318,7 +4323,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo
.
setHandleTime
(
now
);
socialInfo
.
setHandleTime
(
now
);
socialInfo
.
setHandleUser
(
user
.
getId
());
socialInfo
.
setHandleUser
(
user
.
getId
());
socialInfo
.
setHandleUserName
(
user
.
getNickname
());
socialInfo
.
setHandleUserName
(
user
.
getNickname
());
//如果派单有办理成功项 就把最新的办理成功的社保明细ID存储到社保公积金查询中 20250820 修复部分办理成功后派减的问题
if
(
CommonConstants
.
ONE_STRING
.
equals
(
handleStatus
)){
sf
.
setSocialIdSuccess
(
socialInfo
.
getId
());
}
// 社保办理状态补充判断:
// 社保办理状态补充判断:
this
.
setSocialHandleStatus
(
handleStatus
,
socialType
,
flag
,
socialInfo
,
dis
,
sf
,
isAutoHandle
);
this
.
setSocialHandleStatus
(
handleStatus
,
socialType
,
flag
,
socialInfo
,
dis
,
sf
,
isAutoHandle
);
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
540fede7
...
@@ -164,6 +164,7 @@
...
@@ -164,6 +164,7 @@
<result
property=
"socialStatus"
column=
"SOCIAL_STATUS"
/>
<result
property=
"socialStatus"
column=
"SOCIAL_STATUS"
/>
<result
property=
"fundStatus"
column=
"FUND_STATUS"
/>
<result
property=
"fundStatus"
column=
"FUND_STATUS"
/>
<result
property=
"dispatchId"
column=
"DISPATCH_ID"
/>
<result
property=
"dispatchId"
column=
"DISPATCH_ID"
/>
<result
property=
"socialIdSuccess"
column=
"SOCIAL_ID_SUCCESS"
/>
</resultMap>
</resultMap>
...
@@ -530,7 +531,7 @@
...
@@ -530,7 +531,7 @@
a.PERSONAL_INTEREST_FEE,
a.PERSONAL_INTEREST_FEE,
a.SOCIAL_STATUS,
a.SOCIAL_STATUS,
a.FUND_STATUS,
a.FUND_STATUS,
a.DISPATCH_ID,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM
a.DISPATCH_ID,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM
,a.SOCIAL_ID_SUCCESS
</sql>
</sql>
<sql
id=
"tSocialFundInfo_where"
>
<sql
id=
"tSocialFundInfo_where"
>
<if
test=
"tSocialFundInfo != null"
>
<if
test=
"tSocialFundInfo != null"
>
...
...
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