Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
3d1846bc
Commit
3d1846bc
authored
Jun 12, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.24 - 转自动化直推
parent
a645bdd5
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
8 deletions
+43
-8
TSocialInfoController.java
...plus/v1/yifu/social/controller/TSocialInfoController.java
+4
-2
TSocialInfoService.java
...cloud/plus/v1/yifu/social/service/TSocialInfoService.java
+1
-1
TSocialInfoServiceImpl.java
...s/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java
+38
-5
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialInfoController.java
View file @
3d1846bc
...
@@ -227,6 +227,7 @@ public class TSocialInfoController {
...
@@ -227,6 +227,7 @@ public class TSocialInfoController {
* @param id
* @param id
* @param isSocial 1 社保 2 医保 3 全部
* @param isSocial 1 社保 2 医保 3 全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @param ybsfqzcb 医保是否强制参保:0否1是
* @param isPush 1:转自动化直推;其他:仅转自动化,不推送
* @Description:
* @Description:
* @Author: hgw
* @Author: hgw
* @Date: 2024/8/1 18:12
* @Date: 2024/8/1 18:12
...
@@ -238,12 +239,13 @@ public class TSocialInfoController {
...
@@ -238,12 +239,13 @@ public class TSocialInfoController {
,
@RequestParam
(
required
=
false
)
String
ybsfqzcb
,
,
@RequestParam
(
required
=
false
)
String
ybsfqzcb
,
@RequestParam
(
name
=
"isAutoYgsHmc"
,
required
=
false
)
String
isAutoYgsHmc
,
@RequestParam
(
name
=
"isAutoYgsHmc"
,
required
=
false
)
String
isAutoYgsHmc
,
@RequestParam
(
name
=
"isAutoYsdHmc"
,
required
=
false
)
String
isAutoYsdHmc
,
@RequestParam
(
name
=
"isAutoYsdHmc"
,
required
=
false
)
String
isAutoYsdHmc
,
@RequestParam
(
name
=
"isAutoLeaveDoc"
,
required
=
false
)
String
isAutoLeaveDoc
)
{
@RequestParam
(
name
=
"isAutoLeaveDoc"
,
required
=
false
)
String
isAutoLeaveDoc
,
@RequestParam
(
name
=
"isPush"
,
required
=
false
)
String
isPush
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
"请登录!"
);
return
R
.
failed
(
"请登录!"
);
}
}
return
tSocialInfoService
.
doAuto
(
id
,
isSocial
,
ybsfqzcb
,
user
,
isAutoYgsHmc
,
isAutoYsdHmc
,
isAutoLeaveDoc
);
return
tSocialInfoService
.
doAuto
(
id
,
isSocial
,
ybsfqzcb
,
user
,
isAutoYgsHmc
,
isAutoYsdHmc
,
isAutoLeaveDoc
,
isPush
);
}
}
/**
/**
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialInfoService.java
View file @
3d1846bc
...
@@ -135,6 +135,6 @@ public interface TSocialInfoService extends IService<TSocialInfo> {
...
@@ -135,6 +135,6 @@ public interface TSocialInfoService extends IService<TSocialInfo> {
* @Date: 2025/4/25 17:24
* @Date: 2025/4/25 17:24
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
**/
R
<
String
>
doAuto
(
String
id
,
String
isSocial
,
String
ybsfqzcb
,
YifuUser
user
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
);
R
<
String
>
doAuto
(
String
id
,
String
isSocial
,
String
ybsfqzcb
,
YifuUser
user
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
,
String
isPush
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialInfoServiceImpl.java
View file @
3d1846bc
...
@@ -41,7 +41,9 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoMapper;
...
@@ -41,7 +41,9 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoMapper;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TDispatchInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TDispatchInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialFriendPushService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.util.DoSocialTask
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SocialAddAndReduceVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SocialAddAndReduceVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoVo
;
...
@@ -73,6 +75,8 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -73,6 +75,8 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
private
final
TAuditInfoService
tAuditInfoService
;
private
final
TAuditInfoService
tAuditInfoService
;
private
final
TSocialFriendPushService
tSocialFriendPushService
;
/**
/**
* 社保明细表简单分页查询
* 社保明细表简单分页查询
* @param tSocialInfo 社保明细表
* @param tSocialInfo 社保明细表
...
@@ -592,7 +596,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -592,7 +596,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
}
}
}
}
// 更新社保和加日志
// 更新社保和加日志
return
doUpdateCoreAndLog
(
user
,
socialInfo
,
handleRemark
,
canUpdate
,
disExist
);
return
doUpdateCoreAndLog
(
user
,
socialInfo
,
handleRemark
,
canUpdate
,
disExist
,
null
);
}
}
}
}
...
@@ -609,7 +613,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -609,7 +613,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
@Override
@Override
public
R
<
String
>
doAutoBatch
(
List
<
String
>
idList
,
String
isSocial
,
String
ybsfqzcb
,
YifuUser
user
)
{
public
R
<
String
>
doAutoBatch
(
List
<
String
>
idList
,
String
isSocial
,
String
ybsfqzcb
,
YifuUser
user
)
{
for
(
String
id
:
idList
)
{
for
(
String
id
:
idList
)
{
doAuto
(
id
,
isSocial
,
ybsfqzcb
,
user
,
null
,
null
,
null
);
doAuto
(
id
,
isSocial
,
ybsfqzcb
,
user
,
null
,
null
,
null
,
null
);
}
}
return
R
.
ok
(
"成功!"
);
return
R
.
ok
(
"成功!"
);
}
}
...
@@ -618,6 +622,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -618,6 +622,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
* @param id 社保ID
* @param id 社保ID
* @param isSocial 1:社保 2:医保 3:全部
* @param isSocial 1:社保 2:医保 3:全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @param ybsfqzcb 医保是否强制参保:0否1是
* @param isPush 1:转自动化直推;其他:仅转自动化,不推送
* @param user 当前登录人
* @param user 当前登录人
* @Description: 转自动化
* @Description: 转自动化
* @Author: hgw
* @Author: hgw
...
@@ -625,7 +630,8 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -625,7 +630,8 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
**/
@Override
@Override
public
R
<
String
>
doAuto
(
String
id
,
String
isSocial
,
String
ybsfqzcb
,
YifuUser
user
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
)
{
public
R
<
String
>
doAuto
(
String
id
,
String
isSocial
,
String
ybsfqzcb
,
YifuUser
user
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
,
String
isPush
)
{
TSocialInfo
socialInfo
=
this
.
getById
(
id
);
TSocialInfo
socialInfo
=
this
.
getById
(
id
);
if
(
socialInfo
==
null
||
Common
.
isEmpty
(
socialInfo
.
getId
()))
{
if
(
socialInfo
==
null
||
Common
.
isEmpty
(
socialInfo
.
getId
()))
{
return
R
.
failed
(
"未找到社保"
);
return
R
.
failed
(
"未找到社保"
);
...
@@ -734,13 +740,34 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -734,13 +740,34 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
disExist
.
setIsAutoLeaveDoc
(
isAutoLeaveDoc
);
disExist
.
setIsAutoLeaveDoc
(
isAutoLeaveDoc
);
}
}
dispatchInfoMapper
.
updateById
(
disExist
);
dispatchInfoMapper
.
updateById
(
disExist
);
// 恢复为自动化办理中(2)时不可直推税友,仍完成转自动化
if
(
Common
.
isNotNull
(
isPush
)
&&
CommonConstants
.
ONE_STRING
.
equals
(
isPush
)
&&
canUpdate
&&
isAutoProcessingStatus
(
isSocial
,
socialInfo
))
{
R
<
String
>
result
=
doUpdateCoreAndLog
(
user
,
socialInfo
,
handleRemark
,
canUpdate
,
disExist
,
null
);
if
(
R
.
isSuccess
(
result
))
{
return
R
.
ok
(
"当前数据状态含自动办理中,请等待结果!"
);
}
return
result
;
}
// 更新社保和加日志
// 更新社保和加日志
return
doUpdateCoreAndLog
(
user
,
socialInfo
,
handleRemark
,
canUpdate
,
disExist
);
return
doUpdateCoreAndLog
(
user
,
socialInfo
,
handleRemark
,
canUpdate
,
disExist
,
isPush
);
}
}
return
R
.
failed
(
"未找到派单"
);
return
R
.
failed
(
"未找到派单"
);
}
}
}
}
/**
* 转自动化后是否为「自动化办理中」(2),此类状态不可直推税友
*/
private
boolean
isAutoProcessingStatus
(
String
isSocial
,
TSocialInfo
socialInfo
)
{
if
((
CommonConstants
.
ONE_STRING
.
equals
(
isSocial
)
||
CommonConstants
.
THREE_STRING
.
equals
(
isSocial
))
&&
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getYgsHandleStatus
()))
{
return
true
;
}
return
(
CommonConstants
.
TWO_STRING
.
equals
(
isSocial
)
||
CommonConstants
.
THREE_STRING
.
equals
(
isSocial
))
&&
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
());
}
/**
/**
* @param user 当前登录人
* @param user 当前登录人
* @param socialInfo 社保信息
* @param socialInfo 社保信息
...
@@ -752,15 +779,21 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
...
@@ -752,15 +779,21 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
**/
private
R
<
String
>
doUpdateCoreAndLog
(
YifuUser
user
,
TSocialInfo
socialInfo
,
String
handleRemark
private
R
<
String
>
doUpdateCoreAndLog
(
YifuUser
user
,
TSocialInfo
socialInfo
,
String
handleRemark
,
boolean
canUpdate
,
TDispatchInfo
disExist
)
{
,
boolean
canUpdate
,
TDispatchInfo
disExist
,
String
isPush
)
{
if
(
canUpdate
)
{
if
(
canUpdate
)
{
this
.
updateById
(
socialInfo
);
this
.
updateById
(
socialInfo
);
List
<
String
>
dispatchIdList
=
new
ArrayList
<>();
if
(
disExist
!=
null
)
{
if
(
disExist
!=
null
)
{
socialInfo
.
setDispatchId
(
disExist
.
getId
());
socialInfo
.
setDispatchId
(
disExist
.
getId
());
dispatchIdList
.
add
(
disExist
.
getId
());
}
}
// 加流程进展明细
// 加流程进展明细
tAuditInfoService
.
doSaveAuditInfo
(
socialInfo
,
handleRemark
,
handleRemark
,
handleRemark
,
user
tAuditInfoService
.
doSaveAuditInfo
(
socialInfo
,
handleRemark
,
handleRemark
,
handleRemark
,
user
,
CommonConstants
.
ONE_STRING
);
,
CommonConstants
.
ONE_STRING
);
if
(
Common
.
isNotNull
(
isPush
)
&&
CommonConstants
.
ONE_STRING
.
equals
(
isPush
)
&&
!
dispatchIdList
.
isEmpty
())
{
// 推送税友:
tSocialFriendPushService
.
pushFriend
(
null
,
dispatchIdList
,
CommonConstants
.
ZERO_INT
,
user
.
getId
());
}
return
R
.
ok
(
"成功"
);
return
R
.
ok
(
"成功"
);
}
else
{
}
else
{
if
(
Common
.
isNotNull
(
handleRemark
)
&&
handleRemark
.
length
()
>
2
)
{
if
(
Common
.
isNotNull
(
handleRemark
)
&&
handleRemark
.
length
()
>
2
)
{
...
...
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