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
624bbbf0
Commit
624bbbf0
authored
Jul 04, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同更新,添加操作记录
parent
d918cf6b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
6 deletions
+15
-6
TEmployeeLog.java
...yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeLog.java
+2
-2
TEmployeeLogService.java
...ud/plus/v1/yifu/archives/service/TEmployeeLogService.java
+1
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+12
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeLog.java
View file @
624bbbf0
...
...
@@ -44,9 +44,9 @@ public class TEmployeeLog extends BaseEntity {
private
String
id
;
/**
* 类型:0人员档案;1项目档案
* 类型:0人员档案;1项目档案
;2人员和项目档案;3员工合同更新
*/
@Schema
(
description
=
"类型:0人员档案;1项目档案"
)
@Schema
(
description
=
"类型:0人员档案;1项目档案
;2人员和项目档案;3员工合同更新
"
)
private
Integer
type
;
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeLogService.java
View file @
624bbbf0
...
...
@@ -32,7 +32,7 @@ public interface TEmployeeLogService extends IService<TEmployeeLog> {
* 生成修改记录
* @Author pwang
* @Date 2022-06-22 11:32
* @param type 类型:0人员档案;1项目档案;2人员和项目档案
* @param type 类型:0人员档案;1项目档案;2人员和项目档案
;3员工合同更新
* @param empId 档案id
* @param projectId 项目id
* @param oldInfo
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
624bbbf0
...
...
@@ -83,6 +83,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
private
final
TCustomerInfoService
tCustomerInfoService
;
private
final
TAttaInfoService
tAttaInfoService
;
private
final
TEmployeeContractAuditService
tEmployeeContractAuditService
;
private
final
TEmployeeLogService
tEmployeeLogService
;
// 缓存信息
private
final
CacheManager
cacheManager
;
...
...
@@ -534,6 +536,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
/// 个性化校验逻辑
EmployeeContractUpdateVO
excel
;
TEmployeeContractInfo
contractInfo
;
TEmployeeContractInfo
newContractInfo
;
// 执行数据插入操作 组装
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
excel
=
excelVOList
.
get
(
i
);
...
...
@@ -543,9 +546,15 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
// 存储
contractInfo
=
baseMapper
.
getOneContractByApplyNo
(
excel
.
getApplyNo
());
if
(
contractInfo
!=
null
&&
Common
.
isNotNull
(
contractInfo
.
getId
()))
{
contractInfo
.
setContractNo
(
excel
.
getContractNo
());
contractInfo
.
setFileCabinetNo
(
excel
.
getFileCabinetNo
());
this
.
updateById
(
contractInfo
);
newContractInfo
=
new
TEmployeeContractInfo
();
newContractInfo
.
setId
(
contractInfo
.
getId
());
newContractInfo
.
setContractNo
(
excel
.
getContractNo
());
newContractInfo
.
setFileCabinetNo
(
excel
.
getFileCabinetNo
());
this
.
updateById
(
newContractInfo
);
// 记录变更日志
tEmployeeLogService
.
saveModificationRecord
(
CommonConstants
.
dingleDigitIntArray
[
3
],
contractInfo
.
getId
(),
""
,
contractInfo
,
newContractInfo
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
));
}
else
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
EmployeeContractConstants
.
NO_INFO
));
...
...
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