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
b8d58f64
Commit
b8d58f64
authored
Jul 11, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.13-工伤保险允许重复参保
parent
78b65e5d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
77 additions
and
3 deletions
+77
-3
TSocialInfo.java
...om/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
+12
-3
SocialSoldierExportVo.java
...u/cloud/plus/v1/yifu/social/vo/SocialSoldierExportVo.java
+18
-0
TSocialSoldierPageVo.java
...fu/cloud/plus/v1/yifu/social/vo/TSocialSoldierPageVo.java
+19
-0
TSocialFriendServiceImpl.java
...v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
+16
-0
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+12
-0
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
View file @
b8d58f64
...
...
@@ -1011,11 +1011,20 @@ public class TSocialInfo extends BaseEntity {
* 医保起缴日期顺延到次月
* 2025-3-13 17:22:35 hgw
*/
@ExcelAttribute
(
name
=
"医保
起缴日期顺延到次月
"
,
isDate
=
true
)
@Schema
(
description
=
"医保
起缴日期顺延到次月
"
)
@ExcelAttribute
(
name
=
"医保
顺延时间
"
,
isDate
=
true
)
@Schema
(
description
=
"医保
顺延时间
"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保
起缴日期顺延到次月
"
)
@ExcelProperty
(
"医保
顺延时间
"
)
private
Date
ysdSocialStartDateNext
;
/**
* 社保起缴日期顺延到次月
* 2025-7-11 11:42:01 hgw
*/
@ExcelAttribute
(
name
=
"社保顺延时间"
,
isDate
=
true
)
@Schema
(
description
=
"社保顺延时间"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保顺延时间"
)
private
Date
ygsSocialStartDateNext
;
/**
* 养工失反馈-原反馈
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierExportVo.java
View file @
b8d58f64
...
...
@@ -525,5 +525,23 @@ public class SocialSoldierExportVo implements Serializable {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保请求ID"
)
private
String
ysdRequestId
;
/**
* 医保起缴日期顺延到次月
* 2025-3-13 17:22:35 hgw
*/
@ExcelAttribute
(
name
=
"医保顺延时间"
,
isDate
=
true
)
@Schema
(
description
=
"医保顺延时间"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保顺延时间"
)
private
String
ysdSocialStartDateNext
;
/**
* 社保起缴日期顺延到次月
* 2025-7-11 11:42:01 hgw
*/
@ExcelAttribute
(
name
=
"社保顺延时间"
,
isDate
=
true
)
@Schema
(
description
=
"社保顺延时间"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保顺延时间"
)
private
String
ygsSocialStartDateNext
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialSoldierPageVo.java
View file @
b8d58f64
...
...
@@ -25,6 +25,7 @@ import lombok.Data;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
java.util.Date
;
/**
* 社保士兵列表查询
...
...
@@ -111,5 +112,23 @@ public class TSocialSoldierPageVo extends TDispatchInfo {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保请求ID"
)
private
String
ysdRequestId
;
/**
* 医保起缴日期顺延到次月
* 2025-3-13 17:22:35 hgw
*/
@ExcelAttribute
(
name
=
"医保顺延时间"
,
isDate
=
true
)
@Schema
(
description
=
"医保顺延时间"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保顺延时间"
)
private
Date
ysdSocialStartDateNext
;
/**
* 社保起缴日期顺延到次月
* 2025-7-11 11:42:01 hgw
*/
@ExcelAttribute
(
name
=
"社保顺延时间"
,
isDate
=
true
)
@Schema
(
description
=
"社保顺延时间"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保顺延时间"
)
private
Date
ygsSocialStartDateNext
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
View file @
b8d58f64
...
...
@@ -239,6 +239,22 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
// failConfig.getReplay() 1 继续办理 2 中止办理 3 人工办理
// setYgsHandleStatus 3继续办理、4终止办理、5人工处理
if
(
CommonConstants
.
ONE_STRING
.
equals
(
failConfig
.
getReplay
()))
{
// 社保起缴月顺延:
if
(
"工伤保险允许重复参保"
.
equals
(
failConfig
.
getReasonKey
()))
{
Date
nextDate
;
Date
nextMonth
=
DateUtil
.
addMonthByDate
(
new
Date
(),
CommonConstants
.
ONE_INT
);
if
(
Common
.
isNotNull
(
socialInfo
.
getYgsSocialStartDateNext
()))
{
nextDate
=
DateUtil
.
addMonthByDateToOne
(
socialInfo
.
getYgsSocialStartDateNext
(),
CommonConstants
.
ONE_INT
);
if
(
nextDate
.
before
(
nextMonth
))
{
updateSocial
.
setYgsSocialStartDateNext
(
nextDate
);
}
}
else
if
(
Common
.
isNotNull
(
socialInfo
.
getSocialStartDate
()))
{
nextDate
=
DateUtil
.
addMonthByDateToOne
(
socialInfo
.
getSocialStartDate
(),
CommonConstants
.
ONE_INT
);
if
(
nextDate
.
before
(
nextMonth
))
{
updateSocial
.
setYgsSocialStartDateNext
(
nextDate
);
}
}
}
ygsHandleStatus
=
CommonConstants
.
THREE_STRING
;
// 新增流程进展明细
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getDispatchType
()))
{
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
b8d58f64
...
...
@@ -1139,6 +1139,8 @@
<result
property=
"ysdRemark"
column=
"YSD_REMARK"
/>
<result
property=
"ygsRequestId"
column=
"YGS_REQUEST_ID"
/>
<result
property=
"ysdRequestId"
column=
"YSD_REQUEST_ID"
/>
<result
property=
"ygsSocialStartDateNext"
column=
"YGS_SOCIAL_START_DATE_NEXT"
/>
<result
property=
"ysdSocialStartDateNext"
column=
"YSD_SOCIAL_START_DATE_NEXT"
/>
</resultMap>
...
...
@@ -1355,6 +1357,8 @@
,s.YGS_REMARK
,s.YSD_REMARK
,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID
,if(a.type ='0',DATE_FORMAT(YGS_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),'') YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',DATE_FORMAT(YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),'') YSD_SOCIAL_START_DATE_NEXT
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...
...
@@ -1425,6 +1429,8 @@
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK
,if(a.type ='0' and s.add_ygs_Handle_Status != '0', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
,if(a.type ='0',DATE_FORMAT(YGS_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),'') YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',DATE_FORMAT(YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"),'') YSD_SOCIAL_START_DATE_NEXT
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...
...
@@ -1506,6 +1512,8 @@
<result
property=
"ysdRemarkOld"
column=
"YSD_REMARK_OLD"
/>
<result
property=
"ygsRequestId"
column=
"YGS_REQUEST_ID"
/>
<result
property=
"ysdRequestId"
column=
"YSD_REQUEST_ID"
/>
<result
property=
"ygsSocialStartDateNext"
column=
"YGS_SOCIAL_START_DATE_NEXT"
/>
<result
property=
"ysdSocialStartDateNext"
column=
"YSD_SOCIAL_START_DATE_NEXT"
/>
</resultMap>
<!-- hgw 2024-5-10 10:42:33 社保士兵列表查询 -->
...
...
@@ -1592,6 +1600,8 @@
,a.SOCIAL_HOUSEHOLD_NAME,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS
,s.YGS_REMARK,s.YSD_REMARK,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD
,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,'') YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,'') YSD_SOCIAL_START_DATE_NEXT
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...
...
@@ -1689,6 +1699,8 @@
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REMARK, s.YSD_REMARK) YSD_REMARK
,if(a.type ='0' and s.add_ygs_Handle_Status != '0', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) YGS_REQUEST_ID
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,'') YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,'') YSD_SOCIAL_START_DATE_NEXT
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...
...
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