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
38184da0
Commit
38184da0
authored
Jun 23, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
LocalDate2
parent
5db3136a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
13 deletions
+27
-13
TEmployeeInfo.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
+7
-8
EmployeeVO.java
...a/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeVO.java
+5
-5
TEmployeeInfoController.java
.../v1/yifu/archives/controller/TEmployeeInfoController.java
+15
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @
38184da0
...
...
@@ -24,7 +24,6 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.Max
;
import
java.time.LocalDate
;
...
...
@@ -59,21 +58,21 @@ public class TEmployeeInfo extends BaseEntity {
* 员工类型(字典值,0外包1派遣2代理)
*/
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理)"
)
@Max
(
value
=
1
,
message
=
"员工类型不可超过1位"
)
@Max
(
value
=
1
,
message
=
"员工类型不可超过1位"
)
private
String
empNatrue
;
/**
* 员工姓名
*/
@Schema
(
description
=
"员工姓名"
)
@Max
(
value
=
20
,
message
=
"员工姓名不可超过20位"
)
@Max
(
value
=
20
,
message
=
"员工姓名不可超过20位"
)
private
String
empName
;
/**
* 身份证号码
*/
@Schema
(
description
=
"身份证号码"
)
@Max
(
value
=
20
,
message
=
"身份证号码不可超过20位"
)
@Max
(
value
=
20
,
message
=
"身份证号码不可超过20位"
)
private
String
empIdcard
;
/**
...
...
@@ -104,7 +103,7 @@ public class TEmployeeInfo extends BaseEntity {
* 年龄
*/
@Schema
(
description
=
"年龄"
)
@Max
(
value
=
11
,
message
=
"年龄不可超过11位"
)
@Max
(
value
=
11
,
message
=
"年龄不可超过11位"
)
private
Integer
empAge
;
/**
...
...
@@ -123,21 +122,21 @@ public class TEmployeeInfo extends BaseEntity {
* 政治面貌
*/
@Schema
(
description
=
"政治面貌"
)
@Max
(
value
=
32
,
message
=
"政治面貌不可超过32位"
)
@Max
(
value
=
32
,
message
=
"政治面貌不可超过32位"
)
private
String
politicalStatus
;
/**
* 邮箱
*/
@Schema
(
description
=
"邮箱"
)
@Max
(
value
=
32
,
message
=
"邮箱不可超过32位"
)
@Max
(
value
=
32
,
message
=
"邮箱不可超过32位"
)
private
String
empEmail
;
/**
* 手机号码
*/
@Schema
(
description
=
"手机号码"
)
@Max
(
value
=
11
,
message
=
"手机号码不可超过11位"
)
@Max
(
value
=
11
,
message
=
"手机号码不可超过11位"
)
private
String
empPhone
;
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeVO.java
View file @
38184da0
...
...
@@ -23,7 +23,7 @@ import lombok.Data;
import
javax.validation.constraints.Max
;
import
javax.validation.constraints.NotNull
;
import
java.io.Serializable
;
import
java.time.LocalDate
Time
;
import
java.time.LocalDate
;
/**
* 项目档案表excel对应的实体
...
...
@@ -76,13 +76,13 @@ public class EmployeeVO implements Serializable {
* 身份证有效期起
*/
@ExcelProperty
(
value
=
"身份证开始日期"
)
private
LocalDate
Time
validityStart
;
private
LocalDate
validityStart
;
/**
* 身份证有效期止
*/
@ExcelProperty
(
value
=
"身份证截止日期"
)
private
LocalDate
Time
validityEnd
;
private
LocalDate
validityEnd
;
/**
* 婚姻状况
...
...
@@ -189,13 +189,13 @@ public class EmployeeVO implements Serializable {
* 入学时间
*/
@ExcelProperty
(
value
=
"入学时间"
)
private
LocalDate
Time
admissionDate
;
private
LocalDate
admissionDate
;
/**
* 毕业时间
*/
@ExcelProperty
(
value
=
"毕业时间"
)
private
LocalDate
Time
gradutionDate
;
private
LocalDate
gradutionDate
;
/**
* 备注
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java
View file @
38184da0
...
...
@@ -224,6 +224,21 @@ public class TEmployeeInfoController {
return
tEmployeeInfoService
.
deleteEmployee
(
id
);
}
/**
* @param ids
* @Description: 通过ids删除人员档案表
* @Author: hgw
* @Date: 2022/6/21 19:42
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Operation
(
summary
=
"通过ids删除人员档案表"
,
description
=
"通过ids删除人员档案表"
)
@SysLog
(
"通过ids删除人员档案表"
)
@GetMapping
(
"/batchDeleteEmployee"
)
@PreAuthorize
(
"@pms.hasPermission('temployeeinfo_batch_del')"
)
public
R
<
String
>
batchDeleteEmployee
(
@RequestParam
String
ids
)
{
return
tEmployeeInfoService
.
deleteEmployee
(
ids
);
}
/**
* @param id
* @Description: 通过id减档人员档案表
...
...
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