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
061332bf
Commit
061332bf
authored
May 09, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.22-撤销取消电子签
parent
d9c1730c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
7 deletions
+16
-7
TDispatchInfoController.java
...us/v1/yifu/social/controller/TDispatchInfoController.java
+5
-2
TDispatchInfoService.java
...oud/plus/v1/yifu/social/service/TDispatchInfoService.java
+3
-2
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+8
-3
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @
061332bf
...
...
@@ -543,7 +543,10 @@ public class TDispatchInfoController {
@RequestParam
(
name
=
"auditStatus"
,
required
=
true
)
String
auditStatus
,
@RequestParam
(
name
=
"auditRemark"
,
required
=
false
)
String
auditRemark
,
@RequestParam
(
name
=
"remark"
,
required
=
false
)
String
remark
,
@RequestParam
(
name
=
"isSingleAudit"
,
required
=
false
)
String
isSingleAudit
)
{
@RequestParam
(
name
=
"isSingleAudit"
,
required
=
false
)
String
isSingleAudit
,
@RequestParam
(
name
=
"isAutoYgsHmc"
,
required
=
false
)
String
isAutoYgsHmc
,
@RequestParam
(
name
=
"isAutoYsdHmc"
,
required
=
false
)
String
isAutoYsdHmc
,
@RequestParam
(
name
=
"isAutoLeaveDoc"
,
required
=
false
)
String
isAutoLeaveDoc
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
Common
.
isEmpty
(
user
)){
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
...
...
@@ -562,7 +565,7 @@ public class TDispatchInfoController {
List
<
String
>
friendIdList
=
new
ArrayList
<>();
List
<
String
>
soldierIdList
=
new
ArrayList
<>();
R
<
List
<
ErrorMessage
>>
errorList
=
tDispatchInfoService
.
addApplyAudit
(
idList
,
auditStatus
,
auditRemark
,
remark
,
isSingleAudit
,
friendIdList
,
soldierIdList
);
,
remark
,
isSingleAudit
,
friendIdList
,
soldierIdList
,
isAutoYgsHmc
,
isAutoYsdHmc
,
isAutoLeaveDoc
);
//推送税友
if
(!
friendIdList
.
isEmpty
())
{
socialTask
.
pushFriend
(
friendIdList
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java
View file @
061332bf
...
...
@@ -85,10 +85,11 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
DispatchDetailVo
getSocialAndFundInfoById
(
String
id
);
List
<
ErrorMessage
>
addBatchApplyAudit
(
List
<
String
>
idsList
,
YifuUser
user
,
int
flag
,
String
auditStatus
,
String
auditRemark
,
String
remark
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
);
,
String
auditRemark
,
String
remark
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
);
R
<
List
<
ErrorMessage
>>
addApplyAudit
(
List
<
String
>
ids
,
String
auditStatus
,
String
auditRemark
,
String
remark
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
);
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
);
// isAutoFlag:是否社保士兵的自动办理,true :是
R
<
List
<
ErrorMessage
>>
addApplyHandle
(
List
<
String
>
ids
,
String
typeSub
,
String
handleStatus
,
String
handleRemark
,
String
socialType
,
String
remark
,
YifuUser
user
,
boolean
isAutoHandle
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
061332bf
...
...
@@ -3791,7 +3791,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
**/
@Override
public
List
<
ErrorMessage
>
addBatchApplyAudit
(
List
<
String
>
idsList
,
YifuUser
user
,
int
flag
,
String
auditStatus
,
String
auditRemark
,
String
remark
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
)
{
,
String
auditRemark
,
String
remark
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
)
{
List
<
ErrorMessage
>
errorList
=
new
ArrayList
<>();
if
(!
Common
.
isNotNull
(
idsList
))
{
errorList
.
add
(
new
ErrorMessage
(-
1
,
CommonConstants
.
PARAM_IS_NOT_ERROR
));
...
...
@@ -4102,6 +4103,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//记录处理意见到派单 最新的意见会覆盖之前的,详情 到流程中查询
dis
.
setHandleRemark
(
ServiceUtil
.
ifNullToEmpty
(
auditRemark
));
dis
.
setAuditRemark
(
ServiceUtil
.
ifNullToEmpty
(
auditRemark
));
dis
.
setIsAutoYgsHmc
(
isAutoYgsHmc
);
dis
.
setIsAutoYsdHmc
(
isAutoYsdHmc
);
dis
.
setIsAutoLeaveDoc
(
isAutoLeaveDoc
);
auditInfo
.
setDispatchInfoId
(
dis
.
getId
());
//更新派单状态
if
(
CommonConstants
.
ZERO_INT
==
flag
)
{
...
...
@@ -4473,7 +4478,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@ShardingTransactionType
(
TransactionType
.
BASE
)
@Override
public
R
<
List
<
ErrorMessage
>>
addApplyAudit
(
List
<
String
>
ids
,
String
auditStatus
,
String
auditRemark
,
String
remark
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
)
{
,
String
isSingleAudit
,
List
<
String
>
friendIdList
,
List
<
String
>
soldierIdList
,
String
isAutoYgsHmc
,
String
isAutoYsdHmc
,
String
isAutoLeaveDoc
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
null
==
user
)
{
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
...
...
@@ -4493,7 +4498,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return
R
.
failed
(
"派单审核状态参数异常:0待审核 1审核通过 2审核不通过"
);
}
List
<
ErrorMessage
>
errorInfo
=
addBatchApplyAudit
(
ids
,
user
,
flag
,
auditStatus
,
Common
.
isNullToString
(
auditRemark
),
remark
,
isSingleAudit
,
friendIdList
,
soldierIdList
);
,
Common
.
isNullToString
(
auditRemark
),
remark
,
isSingleAudit
,
friendIdList
,
soldierIdList
,
isAutoYgsHmc
,
isAutoYsdHmc
,
isAutoLeaveDoc
);
return
R
.
ok
(
errorInfo
,
"派单审核结果:"
);
}
catch
(
Exception
e
)
{
log
.
error
(
"派单审核异常:"
+
e
.
getMessage
());
...
...
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