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
3da31162
Commit
3da31162
authored
Apr 15, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.22' into MVP1.7.22
parents
9a931bd1
a38d5ad4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
4 deletions
+45
-4
TSocialInfo.java
...om/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
+15
-0
TSocialInfoServiceImpl.java
...s/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java
+25
-4
TSocialInfoMapper.xml
...ocial-biz/src/main/resources/mapper/TSocialInfoMapper.xml
+5
-0
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
View file @
3da31162
...
...
@@ -1251,6 +1251,21 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty
(
"医保是否强制参保"
)
private
String
ybsfqzcb
;
// 用来转自动化时的恢复,只留存2(2自动办理中)
@Length
(
max
=
32
,
message
=
"手动转人工前的养工失状态 不能超过32个字符"
)
@ExcelAttribute
(
name
=
"手动转人工前的养工失状态"
,
maxLength
=
32
)
@Schema
(
description
=
"手动转人工前的养工失状态:(2自动办理中)"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"手动转人工前的养工失状态"
)
private
String
ygsHandleStatusOld
;
@Length
(
max
=
32
,
message
=
"手动转人工前的医生大状态 不能超过32个字符"
)
@ExcelAttribute
(
name
=
"手动转人工前的医生大状态"
,
maxLength
=
32
)
@Schema
(
description
=
"手动转人工前的医生大状态:(2自动办理中)"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"手动转人工前的医生大状态"
)
private
String
ysdHandleStatusOld
;
// 派单id,社保士兵使用
@TableField
(
exist
=
false
)
private
String
dispatchId
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java
View file @
3da31162
...
...
@@ -561,6 +561,10 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
return
R
.
failed
(
"当前养老工伤失业-办理状态不可以转人工!"
);
}
}
else
{
// 仅留存2自动办理中,这样转自动化时,就可以恢复为自动办理中,不会再次推送了
if
(
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getYgsHandleStatus
()))
{
socialInfo
.
setYgsHandleStatusOld
(
CommonConstants
.
TWO_STRING
);
}
socialInfo
.
setYgsHandleStatus
(
CommonConstants
.
FIVE_STRING
);
handleRemark
+=
"养老、工伤、失业手动转人工;"
;
canUpdate
=
true
;
...
...
@@ -578,6 +582,10 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
return
R
.
failed
(
"当前医疗生育大病-办理状态不可以转人工!"
);
}
}
else
{
// 仅留存2自动办理中,这样转自动化时,就可以恢复为自动办理中,不会再次推送了
if
(
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
()))
{
socialInfo
.
setYsdHandleStatusOld
(
CommonConstants
.
TWO_STRING
);
}
socialInfo
.
setYsdHandleStatus
(
CommonConstants
.
FIVE_STRING
);
handleRemark
+=
"医疗、生育、大病手动转人工"
;
canUpdate
=
true
;
...
...
@@ -645,8 +653,14 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getUnemployHandle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getUnemployHandle
()))
{
// 转人工时是2自动办理中,转自动化时,恢复为自动办理中,不会再次推送了
if
(
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getYgsHandleStatusOld
()))
{
socialInfo
.
setYgsHandleStatus
(
CommonConstants
.
TWO_STRING
);
handleRemark
+=
"养老、工伤、失业手动转自动化,恢复为自动办理中;"
;
}
else
{
socialInfo
.
setYgsHandleStatus
(
CommonConstants
.
ONE_STRING
);
handleRemark
+=
"养老、工伤、失业手动转自动化;"
;
}
canUpdate
=
true
;
}
else
if
(!
CommonConstants
.
THREE_STRING
.
equals
(
isSocial
))
{
// 全部的,不反馈某一个失败
...
...
@@ -666,8 +680,15 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialInfo
.
getBigailmentHandle
()))
{
// 转人工时是2自动办理中,转自动化时,恢复为自动办理中,不会再次推送了
if
(
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getYsdHandleStatusOld
()))
{
socialInfo
.
setYsdHandleStatus
(
CommonConstants
.
TWO_STRING
);
handleRemark
+=
"医疗、生育、大病手动转自动化,恢复为自动办理中;"
;
}
else
{
socialInfo
.
setYsdHandleStatus
(
CommonConstants
.
ONE_STRING
);
handleRemark
+=
"医疗、生育、大病手动转自动化"
;
handleRemark
+=
"医疗、生育、大病手动转自动化;"
;
}
canUpdate
=
true
;
}
else
if
(!
CommonConstants
.
THREE_STRING
.
equals
(
isSocial
))
{
// 全部的,不反馈某一个失败
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialInfoMapper.xml
View file @
3da31162
...
...
@@ -156,6 +156,9 @@
<result
property=
"ysdRequestId"
column=
"YSD_REQUEST_ID"
/>
<result
property=
"ysdSocialStartDateNext"
column=
"YSD_SOCIAL_START_DATE_NEXT"
/>
<result
property=
"sfqztb"
column=
"SFQZTB"
/>
<result
property=
"ygsHandleStatusOld"
column=
"YGS_HANDLE_STATUS_OLD"
/>
<result
property=
"ysdHandleStatusOld"
column=
"YSD_HANDLE_STATUS_OLD"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -272,6 +275,8 @@
a.YGS_REQUEST_ID,
a.YSD_REQUEST_ID,
a.YSD_SOCIAL_START_DATE_NEXT,
a.YGS_HANDLE_STATUS_OLD,
a.YSD_HANDLE_STATUS_OLD,
a.SFQZTB
</sql>
...
...
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