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
aeef6eea
Commit
aeef6eea
authored
Feb 03, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.20' into MVP1.7.20
parents
67600ff9
033464a0
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
14 deletions
+15
-14
EmployeeRegistrationLeave.java
...u/cloud/plus/v1/csp/entity/EmployeeRegistrationLeave.java
+6
-5
EmployeeRegistrationLeaveMapper.xml
...main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
+1
-1
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+6
-6
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+2
-2
No files found.
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/entity/EmployeeRegistrationLeave.java
View file @
aeef6eea
...
...
@@ -77,12 +77,13 @@ public class EmployeeRegistrationLeave extends BaseEntity {
@Schema
(
description
=
"合同终止:0空1无需处理2待发起3发起失败4待审核8审核通过10审核不通过"
)
private
String
doStatusContract
;
/**
* 社保减员:0空1无需处理2待派单3发起失败4待审核5待办理6部分办理失败8办理成功9办理失败10审核不通过
* 社保减员:0空1无需处理2待派单3发起失败4待审核5待办理6部分办理失败7办理中8办理成功9办理失败10审核不通过
* 2026-02-03 MVP1.7.20 增加7办理中
*/
@ExcelAttribute
(
name
=
"社保减员:0空1无需处理2待派单3发起失败4待审核5待办理6部分办理失败8办理成功9办理失败10审核不通过"
,
maxLength
=
2
)
@Length
(
max
=
2
,
message
=
"社保减员:0空1无需处理2待派单3发起失败4待审核5待办理6部分办理失败8办理成功9办理失败10审核不通过不能超过2个字符"
)
@ExcelProperty
(
"社保减员:0空1无需处理2待派单3发起失败4待审核5待办理6部分办理失败8办理成功9办理失败10审核不通过"
)
@Schema
(
description
=
"社保减员:0空1无需处理2待派单3发起失败4待审核5待办理6部分办理失败8办理成功9办理失败10审核不通过"
)
@ExcelAttribute
(
name
=
"社保减员:0空1无需处理2待派单3发起失败4待审核5待办理6部分办理失败
7办理中
8办理成功9办理失败10审核不通过"
,
maxLength
=
2
)
@Length
(
max
=
2
,
message
=
"社保减员:0空1无需处理2待派单3发起失败4待审核5待办理6部分办理失败
7办理中
8办理成功9办理失败10审核不通过不能超过2个字符"
)
@ExcelProperty
(
"社保减员:0空1无需处理2待派单3发起失败4待审核5待办理6部分办理失败
7办理中
8办理成功9办理失败10审核不通过"
)
@Schema
(
description
=
"社保减员:0空1无需处理2待派单3发起失败4待审核5待办理6部分办理失败
7办理中
8办理成功9办理失败10审核不通过"
)
private
String
doStatusSocial
;
/**
* 公积金减员:0空1无需处理2待派单3发起失败4待审核5待办理8办理成功9办理失败10审核不通过
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationLeaveMapper.xml
View file @
aeef6eea
...
...
@@ -405,7 +405,7 @@
case a.do_status_contract when '0' then '--' when '1' then '无需处理' when '2' then '待发起' when '3' then '发起失败'
when '4' then '待审核' when '8' then '审核通过' when '10' then '审核不通过' else '--' end do_status_contract,
case a.do_status_social when '0' then '--' when '1' then '无需处理' when '2' then '待派单' when '3' then '发起失败'
when '4' then '待审核' when '5' then '待办理' when '6' then '部分办理失败' when '8' then '办理成功'
when '4' then '待审核' when '5' then '待办理' when '6' then '部分办理失败' when '
7' then '办理中' when '
8' then '办理成功'
when '9' then '办理失败' when '10' then '审核不通过' else '--' end do_status_social,
case a.do_status_fund when '0' then '--' when '1' then '无需处理' when '2' then '待派单' when '3' then '发起失败'
when '4' then '待审核' when '5' then '待办理' when '8' then '办理成功' when '9' then '办理失败' when '10' then '审核不通过' else '--' end do_status_fund,
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
aeef6eea
...
...
@@ -639,7 +639,7 @@ public class SocialFriendConfig {
JSONObject
cbrymdOne
;
String
gj
=
"中国"
;
String
areaName
=
"安徽省|黄山市|徽州区
|徽州区徽州街道|徽州街道文峰社区
"
;
String
areaName
=
"安徽省|黄山市|徽州区"
;
String
hkxz
=
"本地居民户口"
;
JSONObject
jyxx
;
...
...
@@ -699,7 +699,6 @@ public class SocialFriendConfig {
blxmlbArr
=
new
JSONArray
();
blxmlbOne
=
new
JSONObject
();
// 险种类型 例如养老、工伤、医疗等
xzlb
=
"企业职工养老,工伤保险,失业保险"
;
if
(
type
>
2
)
{
xzlb
=
null
;
// 2025-12-8 10:30:50 mvp1.7.18-shuiyou分支,
...
...
@@ -722,6 +721,10 @@ public class SocialFriendConfig {
xzlb
=
"大额医疗"
;
}
}
// 险种类型 徽州区社保不用传
if
(
Common
.
isNotNull
(
xzlb
))
{
blxmlbOne
.
put
(
"xzlb"
,
xzlb
.
split
(
","
));
}
}
// 办理项目
blxmlbOne
.
put
(
"blxm"
,
blxm
);
...
...
@@ -730,10 +733,7 @@ public class SocialFriendConfig {
// 申报工资 社保派单里的“备案基数”
blxmlbOne
.
put
(
"sbgz"
,
vo
.
getRecordBase
());
// 险种类型 例如养老、工伤、医疗等
if
(
Common
.
isNotNull
(
xzlb
))
{
blxmlbOne
.
put
(
"xzlb"
,
xzlb
.
split
(
","
));
}
blxmlbArr
.
add
(
blxmlbOne
);
cbrymdOne
.
put
(
"blxmlb"
,
blxmlbArr
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
aeef6eea
...
...
@@ -4851,8 +4851,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 部分失败是0
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
SIX_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
}
else
if
(
CommonConstants
.
SIX_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
// 派减办理中 - 后续改造这里和离职待办的导出
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
FIVE
_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
// 派减办理中 - 后续改造这里和离职待办的导出
(2026-02-03改造)
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
SEVEN
_STRING
,
CommonConstants
.
ZERO_STRING
,
handleRemark
,
user
);
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getHandleStatus
()))
{
// 部分失败是0
this
.
sendLeave
(
dis
.
getId
(),
CommonConstants
.
ONE_STRING
,
CommonConstants
.
EIGHT_STRING
,
CommonConstants
.
ONE_STRING
,
handleRemark
,
user
);
...
...
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