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
01e068ba
Commit
01e068ba
authored
Jun 23, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人员档案相关
parent
b356c823
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
441 additions
and
125 deletions
+441
-125
TEmpEducation.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmpEducation.java
+93
-93
EmpEducationExcelVO.java
...u/cloud/plus/v1/yifu/archives/vo/EmpEducationExcelVO.java
+3
-2
EmpEducationUpdateExcelVo.java
...d/plus/v1/yifu/archives/vo/EmpEducationUpdateExcelVo.java
+3
-2
EmployeeNewOldVO.java
...yifu/cloud/plus/v1/yifu/archives/vo/EmployeeNewOldVO.java
+45
-0
TEmployeeInfoController.java
.../v1/yifu/archives/controller/TEmployeeInfoController.java
+35
-4
TEmployeeInfoService.java
...d/plus/v1/yifu/archives/service/TEmployeeInfoService.java
+28
-1
TEmpEducationServiceImpl.java
.../yifu/archives/service/impl/TEmpEducationServiceImpl.java
+2
-2
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+226
-15
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+1
-1
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+5
-5
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpEducation.java
View file @
01e068ba
...
...
@@ -22,7 +22,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.time.LocalDate
Time
;
import
java.time.LocalDate
;
/**
* 员工学历信息表
...
...
@@ -36,114 +36,114 @@ import java.time.LocalDateTime;
@Schema
(
description
=
"员工学历信息表"
)
public
class
TEmpEducation
extends
BaseEntity
{
/**
* 主键
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Schema
(
description
=
"主键"
)
private
String
id
;
/**
* 员工ID
*/
@Schema
(
description
=
"员工ID"
)
private
String
empId
;
/**
* 员工姓名
*/
@Schema
(
description
=
"员工姓名"
)
private
String
empName
;
/**
* 员工编码
*/
@Schema
(
description
=
"员工编码"
)
private
String
empCode
;
/**
* 身份证号
*/
@Schema
(
description
=
"身份证号"
)
private
String
empIdcard
;
/**
* 入学时间
*/
@Schema
(
description
=
"入学时间"
)
private
LocalDateTim
e
entryDate
;
/**
* 学历名称
*/
@Schema
(
description
=
"学历名称"
)
private
String
educationName
;
/**
* 结业日期
*/
@Schema
(
description
=
"结业日期"
)
private
LocalDateTim
e
gradutionDate
;
/**
* 学校名称
*/
@Schema
(
description
=
"学校名称"
)
private
String
school
;
/**
* 学制类型
*/
@Schema
(
description
=
"学制类型"
)
private
String
educationSystem
;
/**
* 最高学历标识0是/1否
*/
@Schema
(
description
=
"最高学历标识0是/1否"
)
private
String
highIdentification
;
/**
* 学历类型:全日制、自考、函授等
*/
@Schema
(
description
=
"学历类型:全日制、自考、函授等"
)
private
String
type
;
/**
* 院系名称
*/
@Schema
(
description
=
"院系名称"
)
private
String
collageSystem
;
/**
* 是否删除 0未删除/1删除
*/
/**
* 主键
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Schema
(
description
=
"主键"
)
private
String
id
;
/**
* 员工ID
*/
@Schema
(
description
=
"员工ID"
)
private
String
empId
;
/**
* 员工姓名
*/
@Schema
(
description
=
"员工姓名"
)
private
String
empName
;
/**
* 员工编码
*/
@Schema
(
description
=
"员工编码"
)
private
String
empCode
;
/**
* 身份证号
*/
@Schema
(
description
=
"身份证号"
)
private
String
empIdcard
;
/**
* 入学时间
*/
@Schema
(
description
=
"入学时间"
)
private
LocalDat
e
entryDate
;
/**
* 学历名称
*/
@Schema
(
description
=
"学历名称"
)
private
String
educationName
;
/**
* 结业日期
*/
@Schema
(
description
=
"结业日期"
)
private
LocalDat
e
gradutionDate
;
/**
* 学校名称
*/
@Schema
(
description
=
"学校名称"
)
private
String
school
;
/**
* 学制类型
*/
@Schema
(
description
=
"学制类型"
)
private
String
educationSystem
;
/**
* 最高学历标识0是/1否
*/
@Schema
(
description
=
"最高学历标识0是/1否"
)
private
String
highIdentification
;
/**
* 学历类型:全日制、自考、函授等
*/
@Schema
(
description
=
"学历类型:全日制、自考、函授等"
)
private
String
type
;
/**
* 院系名称
*/
@Schema
(
description
=
"院系名称"
)
private
String
collageSystem
;
/**
* 是否删除 0未删除/1删除
*/
@TableLogic
@Schema
(
description
=
"是否删除 0未删除/1删除"
)
private
String
deleteFlag
;
@Schema
(
description
=
"是否删除 0未删除/1删除"
)
private
String
deleteFlag
;
/**
* 派单标识 1 代表派单生成, 派单审核通过后清空标识 专门用于派单作废
*/
@Schema
(
description
=
"派单标识 1 代表派单生成, 派单审核通过后清空标识 专门用于派单作废"
)
private
String
dispatchFlag
;
/**
* 派单标识 1 代表派单生成, 派单审核通过后清空标识 专门用于派单作废
*/
@Schema
(
description
=
"派单标识 1 代表派单生成, 派单审核通过后清空标识 专门用于派单作废"
)
private
String
dispatchFlag
;
/**
* 证书名称
*/
@Schema
(
description
=
"证书名称"
)
@Schema
(
description
=
"证书名称"
)
private
String
certificationName
;
/**
* 备注
*/
@Schema
(
description
=
"备注"
)
@Schema
(
description
=
"备注"
)
private
String
remark
;
/**
* 专业
*/
@Schema
(
description
=
"专业"
)
@Schema
(
description
=
"专业"
)
private
String
major
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpEducationExcelVO.java
View file @
01e068ba
...
...
@@ -7,6 +7,7 @@ import lombok.Data;
import
javax.validation.constraints.NotNull
;
import
java.io.Serializable
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
/**
...
...
@@ -42,7 +43,7 @@ public class EmpEducationExcelVO implements Serializable {
@NotNull
(
message
=
"入学时间不可为空"
)
@DateTimeFormat
(
"YYYY-MM-dd"
)
@ExcelProperty
(
value
=
"入学时间"
)
private
LocalDate
Time
entryDate
;
private
LocalDate
entryDate
;
/**
* 结业日期
...
...
@@ -50,7 +51,7 @@ public class EmpEducationExcelVO implements Serializable {
@NotNull
(
message
=
"毕业时间不可为空"
)
@DateTimeFormat
(
"YYYY-MM-dd"
)
@ExcelProperty
(
value
=
"毕业时间"
)
private
LocalDate
Time
gradutionDate
;
private
LocalDate
gradutionDate
;
/**
* 学历名称
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpEducationUpdateExcelVo.java
View file @
01e068ba
...
...
@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.format.DateTimeFormat;
import
lombok.Data
;
import
javax.validation.constraints.NotNull
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
/**
...
...
@@ -29,7 +30,7 @@ public class EmpEducationUpdateExcelVo extends EmpEducationExcelVO{
@NotNull
(
message
=
"入学时间不可为空"
)
@DateTimeFormat
(
"YYYY-MM-dd"
)
@ExcelProperty
(
value
=
"入学时间"
)
private
LocalDate
Time
entryDate
;
private
LocalDate
entryDate
;
/**
* 结业日期
...
...
@@ -37,7 +38,7 @@ public class EmpEducationUpdateExcelVo extends EmpEducationExcelVO{
@NotNull
(
message
=
"毕业时间不可为空"
)
@DateTimeFormat
(
"YYYY-MM-dd"
)
@ExcelProperty
(
value
=
"毕业时间"
)
private
LocalDate
Time
gradutionDate
;
private
LocalDate
gradutionDate
;
/**
* 学历名称
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeNewOldVO.java
0 → 100644
View file @
01e068ba
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* 档案更新记录需要的信息
*
* @author huyc
* @date 2022-06-20 17:54:40
*/
@Data
public
class
EmployeeNewOldVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 变更前的档案
*/
private
TEmployeeInfo
oldEmployee
;
/**
* 变更后的档案
*/
private
TEmployeeInfo
newEmployee
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java
View file @
01e068ba
...
...
@@ -231,12 +231,12 @@ public class TEmployeeInfoController {
* @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删除人员档案表"
)
@Operation
(
summary
=
"通过ids
批量删除人员档案表"
,
description
=
"通过ids批量
删除人员档案表"
)
@SysLog
(
"通过ids
批量
删除人员档案表"
)
@GetMapping
(
"/batchDeleteEmployee"
)
@PreAuthorize
(
"@pms.hasPermission('temployeeinfo_batch_del')"
)
public
R
<
String
>
batchDeleteEmployee
(
@RequestParam
String
ids
)
{
return
tEmployeeInfoService
.
d
eleteEmployee
(
ids
);
public
R
<
List
<
ErrorMessage
>
>
batchDeleteEmployee
(
@RequestParam
String
ids
)
{
return
tEmployeeInfoService
.
batchD
eleteEmployee
(
ids
);
}
/**
...
...
@@ -254,6 +254,37 @@ public class TEmployeeInfoController {
return
tEmployeeInfoService
.
minusEmployee
(
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
(
"/batchMinusEmployee"
)
@PreAuthorize
(
"@pms.hasPermission('temployeeinfo_batch_minus')"
)
public
R
<
List
<
ErrorMessage
>>
batchMinusEmployee
(
@RequestParam
String
ids
)
{
return
tEmployeeInfoService
.
batchMinusEmployee
(
ids
);
}
/**
* @param id 离职档案id
* @param projectIds 需要复项的项目ids
* @Description: 档案复档
* @Author: hgw
* @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"
)
@SysLog
(
"档案复档"
)
@GetMapping
(
"/restoreEmployee"
)
@PreAuthorize
(
"@pms.hasPermission('temployeeinfo_restore')"
)
public
R
<
String
>
restoreEmployee
(
@RequestParam
String
id
,
String
projectIds
)
{
return
tEmployeeInfoService
.
restoreEmployee
(
id
,
projectIds
);
}
/**
* @param excelList
* @param bindingResult
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeInfoService.java
View file @
01e068ba
...
...
@@ -93,15 +93,42 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
**/
R
<
String
>
deleteEmployee
(
String
id
);
/**
* @param ids
* @Description: 批量删除
* @Author: hgw
* @Date: 2022/6/23 16:45
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R
<
List
<
ErrorMessage
>>
batchDeleteEmployee
(
String
ids
);
/**
* @param id
* @Description: 减
项
* @Description: 减
档
* @Author: hgw
* @Date: 2022/6/21 19:50
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R
<
String
>
minusEmployee
(
String
id
);
/**
* @param id
* @Description: 恢复档案
* @Author: hgw
* @Date: 2022/6/23 17:31
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
R
<
String
>
restoreEmployee
(
String
id
,
String
projectIds
);
/**
* @param ids
* @Description: 批量减档
* @Author: hgw
* @Date: 2022/6/23 17:12
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.pig4cloud.plugin.excel.vo.ErrorMessage>>
**/
R
<
List
<
ErrorMessage
>>
batchMinusEmployee
(
String
ids
);
/**
* @param employeeInfo 档案信息
* @param fileSource 人员档案来源(4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpEducationServiceImpl.java
View file @
01e068ba
...
...
@@ -274,11 +274,11 @@ public class TEmpEducationServiceImpl extends ServiceImpl<TEmpEducationMapper, T
TEmpEducation
exist
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmpEducation
>
query
().
lambda
()
.
eq
(
TEmpEducation:
:
getEducationName
,
education
.
getEducationName
())
.
eq
(
TEmpEducation:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmpEducation:
:
getEmpIdcard
,
education
.
getE
ducationName
())
.
eq
(
TEmpEducation:
:
getEmpIdcard
,
education
.
getE
mpIdcard
())
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
exist
)){
exist
.
setHighIdentification
(
education
.
getHighIdentification
());
exist
.
setSchool
(
education
.
get
Type
());
exist
.
setSchool
(
education
.
get
School
());
exist
.
setMajor
(
education
.
getMajor
());
exist
.
setEntryDate
(
education
.
getEntryDate
());
exist
.
setGradutionDate
(
education
.
getGradutionDate
());
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
01e068ba
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
01e068ba
...
...
@@ -540,7 +540,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
public
void
saveEmployeeProjectInfo
(
TEmployeeInfo
employeeInfo
)
{
TEmployeeProject
tEmployeeProject
=
new
TEmployeeProject
();
tEmployeeProject
.
setEmpId
(
employeeInfo
.
getId
());
tEmployeeProject
.
setEmpCode
(
this
.
get
Code
());
tEmployeeProject
.
setEmpCode
(
employeeInfo
.
getEmp
Code
());
tEmployeeProject
.
setEmpNatrue
(
employeeInfo
.
getEmpNatrue
());
tEmployeeProject
.
setEmpName
(
employeeInfo
.
getEmpName
());
tEmployeeProject
.
setEmpIdcard
(
employeeInfo
.
getEmpIdcard
());
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
01e068ba
...
...
@@ -149,7 +149,7 @@
AND a.EMP_CODE = #{tEmployeeInfo.empCode}
</if>
<if
test=
"tEmployeeInfo.empNatrue != null and tEmployeeInfo.empNatrue.trim() != ''"
>
AND a.EMP_NATRUE
= #{tEmployeeInfo.empNatrue}
AND a.EMP_NATRUE
in in concat('(',${tEmployeeInfo.empNatrue},')')
</if>
<if
test=
"tEmployeeInfo.empName != null and tEmployeeInfo.empName.trim() != ''"
>
AND a.EMP_NAME = #{tEmployeeInfo.empName}
...
...
@@ -247,16 +247,16 @@
</if>
</if>
<if
test=
"tEmployeeInfo.contractStatus != null"
>
AND a.CONTRACT_STATUS
= #{tEmployeeInfo.contractStatus}
AND a.CONTRACT_STATUS
in concat('(',${tEmployeeInfo.contractStatus},')')
</if>
<if
test=
"tEmployeeInfo.insuranceStatus != null"
>
AND a.INSURANCE_STATUS
= #{tEmployeeInfo.insuranceStatus}
AND a.INSURANCE_STATUS
in concat('(',${tEmployeeInfo.insuranceStatus},')')
</if>
<if
test=
"tEmployeeInfo.socialStatus != null"
>
AND a.SOCIAL_STATUS
= #{tEmployeeInfo.socialStatus}
AND a.SOCIAL_STATUS
in concat('(',${tEmployeeInfo.socialStatus},')')
</if>
<if
test=
"tEmployeeInfo.fundStatus != null"
>
AND a.FUND_STATUS
= #{tEmployeeInfo.fundStatus}
AND a.FUND_STATUS
in concat('(',${tEmployeeInfo.fundStatus},')')
</if>
<if
test=
"tEmployeeInfo.salaryStatus != null"
>
AND a.SALARY_STATUS = #{tEmployeeInfo.salaryStatus}
...
...
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