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
0ce216b7
Commit
0ce216b7
authored
Apr 25, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.10-审核记录
parent
47dbc5e9
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
36 deletions
+10
-36
TSocialInfoController.java
...plus/v1/yifu/social/controller/TSocialInfoController.java
+10
-3
TAuditInfoService.java
.../cloud/plus/v1/yifu/social/service/TAuditInfoService.java
+0
-10
TAuditInfoServiceImpl.java
...us/v1/yifu/social/service/impl/TAuditInfoServiceImpl.java
+0
-23
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TSocialInfoController.java
View file @
0ce216b7
...
...
@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
...
...
@@ -27,8 +28,11 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TDispatchInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialSoldierService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialInfoSearchVo
;
...
...
@@ -60,7 +64,7 @@ public class TSocialInfoController {
private
final
TSocialSoldierService
tSocialSoldierService
;
private
final
T
AuditInfoService
tAuditInfoService
;
private
final
T
DispatchInfoMapper
tDispatchInfoMapper
;
/**
...
...
@@ -236,10 +240,13 @@ public class TSocialInfoController {
tSocialInfoService
.
updateById
(
socialInfo
);
handleRemark
+=
"医疗、生育、大病手动转人工"
;
}
TDispatchInfo
disExist
=
tDispatchInfoMapper
.
selectOne
(
Wrappers
.<
TDispatchInfo
>
query
().
lambda
()
.
eq
(
TDispatchInfo:
:
getSocialId
,
id
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
disExist
!=
null
)
{
socialInfo
.
setDispatchId
(
disExist
.
getId
());
}
// 加记录
tSocialSoldierService
.
doSocialTAuditInfo
(
socialInfo
,
handleRemark
,
handleRemark
,
handleRemark
,
user
);
// 加派单审核记录
tAuditInfoService
.
doSaveAuditInfo
(
socialInfo
,
handleRemark
,
handleRemark
,
handleRemark
,
user
);
return
R
.
ok
(
"成功!"
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TAuditInfoService.java
View file @
0ce216b7
...
...
@@ -22,9 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TAuditInfoSearchVo
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -51,12 +49,4 @@ public interface TAuditInfoService extends IService<TAuditInfo> {
List
<
TAuditInfo
>
noPageDiy
(
TAuditInfoSearchVo
searchVo
);
/**
* @Description: 加派单审核记录
* @Author: hgw
* @Date: 2025/4/25 10:35
* @return: void
**/
void
doSaveAuditInfo
(
TSocialInfo
social
,
String
title
,
String
handleRemark
,
String
remark
,
YifuUser
user
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TAuditInfoServiceImpl.java
View file @
0ce216b7
...
...
@@ -32,9 +32,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TAuditInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TAuditInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TAuditInfoSearchVo
;
...
...
@@ -48,7 +46,6 @@ import java.io.IOException;
import
java.io.InputStream
;
import
java.net.URLEncoder
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
/**
...
...
@@ -247,24 +244,4 @@ public class TAuditInfoServiceImpl extends ServiceImpl<TAuditInfoMapper, TAuditI
this
.
save
(
insert
);
}
public
void
doSaveAuditInfo
(
TSocialInfo
social
,
String
title
,
String
handleRemark
,
String
remark
,
YifuUser
user
)
{
TAuditInfo
auditInfo
=
new
TAuditInfo
();
auditInfo
.
setType
(
CommonConstants
.
ONE_STRING
);
auditInfo
.
setId
(
null
);
auditInfo
.
setAuditStatus
(
CommonConstants
.
TWO_STRING
);
auditInfo
.
setAuditRemark
(
handleRemark
);
if
(
Common
.
isNotNull
(
title
)
&&
title
.
length
()
>
255
)
{
title
=
title
.
substring
(
0
,
255
);
}
auditInfo
.
setTitle
(
title
);
auditInfo
.
setOrganName
(
user
.
getDeptName
());
auditInfo
.
setAuditUser
(
user
.
getNickname
());
auditInfo
.
setAuditTime
(
new
Date
());
auditInfo
.
setRemark
(
remark
);
auditInfo
.
setIsCommision
(
CommonConstants
.
ONE_STRING
);
auditInfo
.
setDispatchInfoId
(
social
.
getDispatchId
());
auditInfo
.
setEmpIdcard
(
social
.
getEmpIdcard
());
auditInfo
.
setSocialId
(
social
.
getId
());
this
.
save
(
auditInfo
);
}
}
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