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
1f0a60ad
Commit
1f0a60ad
authored
Jun 28, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人员档案相关-删除接口优化
parent
551fdbd9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
+14
-8
TEmployeeInfo.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
+7
-7
TEmployeeInfoController.java
.../v1/yifu/archives/controller/TEmployeeInfoController.java
+1
-1
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+6
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @
1f0a60ad
...
...
@@ -258,31 +258,31 @@ public class TEmployeeInfo extends BaseEntity {
/**
* 员工合同状态(字典)
*/
@Schema
(
description
=
"员工合同状态(字典)"
)
@Schema
(
description
=
"员工合同状态(字典)
0初始状态
"
)
private
Integer
contractStatus
;
/**
* 商险状态(字典)
*/
@Schema
(
description
=
"商险状态(字典)"
)
@Schema
(
description
=
"商险状态(字典)
0初始状态
"
)
private
Integer
insuranceStatus
;
/**
* 社保状态(字典)
*/
@Schema
(
description
=
"社保状态(字典)"
)
@Schema
(
description
=
"社保状态(字典)
0初始状态
"
)
private
Integer
socialStatus
;
/**
* 公积金状态(字典)
* 公积金状态(字典)
0初始状态
*/
@Schema
(
description
=
"公积金状态(字典)"
)
@Schema
(
description
=
"公积金状态(字典)
0初始状态
"
)
private
Integer
fundStatus
;
/**
* 近3个月发薪(0
否;1是
)
* 近3个月发薪(0
无;1是;2否
)
*/
@Schema
(
description
=
"近3个月发薪(0
否;1是
)"
)
@Schema
(
description
=
"近3个月发薪(0
无;1是;2否
)"
)
private
Integer
salaryStatus
;
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java
View file @
1f0a60ad
...
...
@@ -279,7 +279,7 @@ public class TEmployeeInfoController {
* @Date: 2022/6/23 17:40
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Operation
(
summary
=
"档案复档"
,
description
=
"档案复档 projectIds:项目档案ids"
)
@Operation
(
summary
=
"档案复档
temployeeinfo_restore
"
,
description
=
"档案复档 projectIds:项目档案ids"
)
@SysLog
(
"档案复档"
)
@GetMapping
(
"/restoreEmployee"
)
@PreAuthorize
(
"@pms.hasPermission('temployeeinfo_restore')"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
1f0a60ad
...
...
@@ -892,6 +892,12 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
employeeInfo
.
setFileStatus
(
CommonConstants
.
ZERO_INT
);
employeeInfo
.
setProjectNum
(
CommonConstants
.
ONE_INT
);
employeeInfo
.
setDeleteFlag
(
CommonConstants
.
STATUS_NORMAL
);
employeeInfo
.
setContractStatus
(
CommonConstants
.
ZERO_INT
);
employeeInfo
.
setInsuranceStatus
(
CommonConstants
.
ZERO_INT
);
employeeInfo
.
setSocialStatus
(
CommonConstants
.
ZERO_INT
);
employeeInfo
.
setFundStatus
(
CommonConstants
.
ZERO_INT
);
employeeInfo
.
setSalaryStatus
(
CommonConstants
.
ZERO_INT
);
// 生成性别年龄等:
this
.
setBaseSexInfo
(
employeeInfo
);
}
...
...
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