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
526f6fdb
Commit
526f6fdb
authored
Apr 08, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21
parents
b942ecf9
30b6f422
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
0 deletions
+23
-0
TSocialInfo.java
...om/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
+20
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+3
-0
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
View file @
526f6fdb
...
@@ -615,6 +615,26 @@ public class TSocialInfo extends BaseEntity {
...
@@ -615,6 +615,26 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty
(
"社保是否可以补缴"
)
@ExcelProperty
(
"社保是否可以补缴"
)
private
String
canOverpayPension
;
private
String
canOverpayPension
;
/**
* 社保补缴政策
*/
@Length
(
max
=
500
,
message
=
"社保补缴政策 不能超过500个字符"
)
@ExcelAttribute
(
name
=
"社保补缴政策"
,
maxLength
=
500
)
@Schema
(
description
=
"社保补缴政策"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保补缴政策"
)
private
String
payPolicyPension
;
/**
* 医保补缴政策
*/
@Length
(
max
=
500
,
message
=
"医保补缴政策 不能超过500个字符"
)
@ExcelAttribute
(
name
=
"医保补缴政策"
,
maxLength
=
500
)
@Schema
(
description
=
"医保补缴政策"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保补缴政策"
)
private
String
payPolicyMedical
;
/**
/**
* 医保是否可以补缴: 0:是,1:否
* 医保是否可以补缴: 0:是,1:否
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
526f6fdb
...
@@ -1818,6 +1818,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1818,6 +1818,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
social
.
setCanOverpay
(
socialSet
.
getCanOverpay
());
social
.
setCanOverpay
(
socialSet
.
getCanOverpay
());
social
.
setCanOverpayPension
(
socialSet
.
getCanOverpayPension
());
social
.
setCanOverpayPension
(
socialSet
.
getCanOverpayPension
());
social
.
setPayPolicyPension
(
socialSet
.
getPayPolicyPension
());
social
.
setPayPolicyMedical
(
socialSet
.
getPayPolicyMedical
());
social
.
setCanOverpayMedical
(
socialSet
.
getCanOverpayMedical
());
social
.
setCanOverpayMedical
(
socialSet
.
getCanOverpayMedical
());
social
.
setCardinalId
(
socialSet
.
getId
());
social
.
setCardinalId
(
socialSet
.
getId
());
social
.
setSocialHousehold
(
socialSet
.
getDepartId
());
social
.
setSocialHousehold
(
socialSet
.
getDepartId
());
...
@@ -3062,6 +3064,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3062,6 +3064,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return
true
;
return
true
;
}
}
if
(
Common
.
isNotNull
(
excel
.
getBigailmentStart
())
if
(
Common
.
isNotNull
(
excel
.
getBigailmentStart
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
socialSet
.
getIsIllness
())
&&
ServiceUtil
.
checkDispatchDate
(
LocalDateTimeUtils
.
convertDateToLDT
(
excel
.
getBigailmentStart
()),
&&
ServiceUtil
.
checkDispatchDate
(
LocalDateTimeUtils
.
convertDateToLDT
(
excel
.
getBigailmentStart
()),
socialSet
.
getCanOverpayMedical
(),
socialSet
.
getOverpayNumberMedical
(),
socialSet
.
getHaveThisMonthMedical
()))
{
socialSet
.
getCanOverpayMedical
(),
socialSet
.
getOverpayNumberMedical
(),
socialSet
.
getHaveThisMonthMedical
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_START_IS_ERROR
)));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_START_IS_ERROR
)));
...
...
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