Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
98f39acd
You need to sign in or sign up before continuing.
Commit
98f39acd
authored
Feb 28, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入离职登记提交
parent
46680ef7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
1325 additions
and
6 deletions
+1325
-6
EmpProjectStatusVo.java
...fu/cloud/plus/v1/yifu/archives/vo/EmpProjectStatusVo.java
+19
-0
TEmployeeProjectController.java
.../yifu/archives/controller/TEmployeeProjectController.java
+15
-5
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+2
-0
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+14
-0
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+2
-0
RegistConstants.java
...com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
+22
-0
EmployeeRegistration.java
...m/yifu/cloud/plus/v1/csp/entity/EmployeeRegistration.java
+86
-0
EmployeeRegistrationExportVo.java
...fu/cloud/plus/v1/csp/vo/EmployeeRegistrationExportVo.java
+73
-0
EmployeeRegistrationHrExportVo.java
.../cloud/plus/v1/csp/vo/EmployeeRegistrationHrExportVo.java
+83
-0
EmployeeRegistrationSearchVo.java
...fu/cloud/plus/v1/csp/vo/EmployeeRegistrationSearchVo.java
+65
-0
EmployeeRegistrationVo.java
...com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationVo.java
+79
-0
EmployeeRegistrationController.java
...lus/v1/csp/controller/EmployeeRegistrationController.java
+152
-0
EmployeeRegistrationMapper.java
.../cloud/plus/v1/csp/mapper/EmployeeRegistrationMapper.java
+36
-0
EmployeeRegistrationService.java
...loud/plus/v1/csp/service/EmployeeRegistrationService.java
+71
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+385
-0
EmployeeRegistrationMapper.xml
.../src/main/resources/mapper/EmployeeRegistrationMapper.xml
+220
-0
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpProjectStatusVo.java
0 → 100644
View file @
98f39acd
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* @Author hgw
* @Date 2022-10-21 09:50:08
* @Description 通用Vo
* @Version 1.0
*/
@Data
public
class
EmpProjectStatusVo
implements
Serializable
{
private
String
deptNo
;
private
String
empIdcard
;
private
LocalDateTime
projectTime
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @
98f39acd
...
@@ -22,10 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -22,10 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmpStatusVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportParamVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainDataVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.UpProjectSocialFundVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
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.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
...
@@ -375,11 +372,24 @@ public class TEmployeeProjectController {
...
@@ -375,11 +372,24 @@ public class TEmployeeProjectController {
* @Description: 通过id获取结算主体及单位部分信息
* @Description: 通过id获取结算主体及单位部分信息
* @Author: huyc
* @Author: huyc
* @Date: 2025/2/25 17:01
* @Date: 2025/2/25 17:01
* @return:
com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo>
* @return:
**/
**/
@Inner
@Inner
@PostMapping
(
"/inner/getUnProjectEmpList"
)
@PostMapping
(
"/inner/getUnProjectEmpList"
)
public
TSalaryStandardSelectViewVo
getUnProjectEmpList
(
@RequestBody
List
<
TSalaryStandardUnprojectVo
>
voList
)
{
public
TSalaryStandardSelectViewVo
getUnProjectEmpList
(
@RequestBody
List
<
TSalaryStandardUnprojectVo
>
voList
)
{
return
tEmployeeProjectService
.
getUnProjectEmpList
(
voList
);
return
tEmployeeProjectService
.
getUnProjectEmpList
(
voList
);
}
}
/**
* @param vo 人员信息
* @Description: 获取人员项目档案信息
* @Author: huyc
* @Date: 2025/2/27 15:18
* @return:
**/
@Inner
@PostMapping
(
"/inner/getEmpProjectStatus"
)
public
EmpProjectStatusVo
getEmpProjectStatus
(
@RequestBody
EmpProjectStatusVo
vo
)
{
return
tEmployeeProjectService
.
getEmpProjectStatus
(
vo
);
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
98f39acd
...
@@ -44,6 +44,8 @@ import java.util.Map;
...
@@ -44,6 +44,8 @@ import java.util.Map;
public
interface
TEmployeeProjectService
extends
IService
<
TEmployeeProject
>
{
public
interface
TEmployeeProjectService
extends
IService
<
TEmployeeProject
>
{
TSalaryStandardSelectViewVo
getUnProjectEmpList
(
List
<
TSalaryStandardUnprojectVo
>
voList
);
TSalaryStandardSelectViewVo
getUnProjectEmpList
(
List
<
TSalaryStandardUnprojectVo
>
voList
);
EmpProjectStatusVo
getEmpProjectStatus
(
EmpProjectStatusVo
vo
);
/**
/**
* @param tEmployeeProject
* @param tEmployeeProject
* @Description: 新增项目档案校验
* @Description: 新增项目档案校验
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
98f39acd
...
@@ -138,6 +138,20 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -138,6 +138,20 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
}
}
}
@Override
public
EmpProjectStatusVo
getEmpProjectStatus
(
EmpProjectStatusVo
vo
)
{
TEmployeeProject
employeeProject
=
this
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
vo
.
getEmpIdcard
())
.
eq
(
TEmployeeProject:
:
getDeptNo
,
vo
.
getDeptNo
())
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
employeeProject
))
{
vo
.
setProjectTime
(
employeeProject
.
getCreateTime
());
return
vo
;
}
return
null
;
}
@Override
@Override
public
R
addCheck
(
TEmployeeProject
tEmployeeProject
)
{
public
R
addCheck
(
TEmployeeProject
tEmployeeProject
)
{
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
98f39acd
...
@@ -634,6 +634,8 @@ public interface CommonConstants {
...
@@ -634,6 +634,8 @@ public interface CommonConstants {
List
<
String
>
socialStatus
=
Stream
.
of
(
"3"
,
"4"
,
"6"
,
"7"
,
"9"
,
"11"
,
"12"
).
collect
(
Collectors
.
toList
());
List
<
String
>
socialStatus
=
Stream
.
of
(
"3"
,
"4"
,
"6"
,
"7"
,
"9"
,
"11"
,
"12"
).
collect
(
Collectors
.
toList
());
List
<
String
>
processStatus
=
Stream
.
of
(
"0"
,
"1"
).
collect
(
Collectors
.
toList
());
List
<
String
>
socialInfoStatus
=
Stream
.
of
(
"1"
,
"3"
,
"5"
,
"7"
).
collect
(
Collectors
.
toList
());
List
<
String
>
socialInfoStatus
=
Stream
.
of
(
"1"
,
"3"
,
"5"
,
"7"
).
collect
(
Collectors
.
toList
());
List
<
String
>
deptList
=
Stream
.
of
(
"安徽一册档案管理有限公司"
,
"安徽顾合企业管理咨询有限公司"
,
"安徽赤道线数字传媒科技有限公司"
,
"劳务业务中心"
,
"易服智享&研究院"
).
collect
(
Collectors
.
toList
());
List
<
String
>
deptList
=
Stream
.
of
(
"安徽一册档案管理有限公司"
,
"安徽顾合企业管理咨询有限公司"
,
"安徽赤道线数字传媒科技有限公司"
,
"劳务业务中心"
,
"易服智享&研究院"
).
collect
(
Collectors
.
toList
());
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
0 → 100644
View file @
98f39acd
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
constants
;
/**
* @author licancan
* @description 商险常量
* @date 2022-07-18 17:52:59
*/
public
class
RegistConstants
{
public
static
final
String
IMPORT_EXIT_CHECK
=
"模板中已存在该员工的登记信息"
;
public
static
final
String
NO_DATA_TO_HANDLE
=
"未找到对应未处理状态的数据!"
;
public
static
final
String
IDCARD_FORMAT_ERROR
=
"身份证格式错误!"
;
public
static
final
String
PHONE_FORMAT_ERROR
=
"手机号格式错误!"
;
public
static
final
String
REGIST_SAME_CHECK
=
"该人员入职/离职数据已登记,请勿重复操作"
;
public
static
final
String
EMP_PROJECT_EXIT_CHECK
=
"未找到该人员对应的在项信息!"
;
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/entity/EmployeeRegistration.java
0 → 100644
View file @
98f39acd
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
entity
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
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
java.util.Date
;
/**
* 入离职登记表
*
* @author huych
* @date 2025-02-25 14:48:11
*/
@Data
@TableName
(
"employee_registration"
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Schema
(
description
=
"入离职登记表"
)
public
class
EmployeeRegistration
extends
BaseEntity
{
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Schema
(
description
=
"主键ID"
)
private
String
id
;
@ExcelProperty
(
value
=
"项目编码"
)
private
String
deptNo
;
@ExcelProperty
(
value
=
"项目名称"
)
private
String
deptName
;
@ExcelProperty
(
value
=
"项目id"
)
private
String
deptId
;
@Schema
(
description
=
"员工姓名"
)
private
String
employeeName
;
@Schema
(
description
=
"身份证号"
)
private
String
empIdcard
;
@Schema
(
description
=
"员工手机号"
)
private
String
empPhone
;
@Schema
(
description
=
"岗位"
)
private
String
position
;
@Schema
(
description
=
"反馈类型 1入职 2离职"
)
private
String
feedbackType
;
@Schema
(
description
=
"入/离职日期"
)
private
Date
joinLeaveDate
;
@Schema
(
description
=
"处理状态,0已接收,1未处理,2已处理"
)
private
String
processStatus
;
@Schema
(
description
=
"登记人"
)
private
String
registorUsername
;
@Schema
(
description
=
"登记人所在部门名称"
)
private
String
registorDeptname
;
@Schema
(
description
=
"登记人部门id"
)
private
String
registorDeptid
;
@Schema
(
description
=
"登记人手机号"
)
private
String
registorPhone
;
@Schema
(
description
=
"员工所在部门名称"
)
private
String
empDeptname
;
@Schema
(
description
=
"员工部门id"
)
private
String
empDeptid
;
@Schema
(
description
=
"客服手机号"
)
private
String
customerPhone
;
@Schema
(
description
=
"客服姓名号"
)
private
String
customerUsername
;
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationExportVo.java
0 → 100644
View file @
98f39acd
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* 入离职登记表
*
* @author huych
* @date 2025-02-25 14:48:11
*/
@Data
@ColumnWidth
(
12
)
public
class
EmployeeRegistrationExportVo
extends
RowIndex
implements
Serializable
{
@ExcelAttribute
(
name
=
"员工姓名"
)
@Schema
(
description
=
"员工姓名"
)
@ExcelProperty
(
"员工姓名"
)
private
String
employeeName
;
@ExcelAttribute
(
name
=
"身份证号"
)
@Schema
(
description
=
"身份证号"
)
@ExcelProperty
(
"身份证号"
)
private
String
empIdcard
;
@ExcelAttribute
(
name
=
"员工手机号"
)
@Schema
(
description
=
"员工手机号"
)
@ExcelProperty
(
"员工手机号"
)
private
String
empPhone
;
@ExcelAttribute
(
name
=
"所属部门"
)
@Schema
(
description
=
"所属部门"
)
@ExcelProperty
(
"所属部门"
)
private
String
empDeptname
;
@ExcelAttribute
(
name
=
"就职岗位"
)
@Schema
(
description
=
"就职岗位"
)
@ExcelProperty
(
"就职岗位"
)
private
String
position
;
@ExcelAttribute
(
name
=
"登记类型"
)
@Schema
(
description
=
"登记类型 1入职 2离职"
)
@ExcelProperty
(
"登记类型"
)
private
String
feedbackType
;
@ExcelAttribute
(
name
=
"入/离职日期"
,
isDate
=
true
)
@Schema
(
description
=
"入/离职日期"
)
@ExcelProperty
(
"入/离职日期"
)
private
Date
joinLeaveDate
;
@ExcelAttribute
(
name
=
"登记人"
)
@Schema
(
description
=
"登记人"
)
@ExcelProperty
(
"登记人"
)
private
String
registorUsername
;
@ExcelAttribute
(
name
=
"登记时间"
,
isDate
=
true
)
@Schema
(
description
=
"登记时间"
)
@ExcelProperty
(
"登记时间"
)
private
Date
createTime
;
@ExcelAttribute
(
name
=
"处理状态"
)
@Schema
(
description
=
"处理状态,0已接收,1未处理,2已处理"
)
@ExcelProperty
(
"处理状态"
)
private
String
processStatus
;
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationHrExportVo.java
0 → 100644
View file @
98f39acd
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* 入离职登记表
*
* @author huych
* @date 2025-02-25 14:48:11
*/
@Data
@ColumnWidth
(
12
)
public
class
EmployeeRegistrationHrExportVo
extends
RowIndex
implements
Serializable
{
@ExcelAttribute
(
name
=
"项目名称"
)
@Schema
(
description
=
"项目名称"
)
@ExcelProperty
(
"项目名称"
)
private
String
deptName
;
@ExcelAttribute
(
name
=
"项目编码"
)
@Schema
(
description
=
"项目编码"
)
@ExcelProperty
(
"项目编码"
)
private
String
deptNo
;
@ExcelAttribute
(
name
=
"员工姓名"
)
@Schema
(
description
=
"员工姓名"
)
@ExcelProperty
(
"员工姓名"
)
private
String
employeeName
;
@ExcelAttribute
(
name
=
"身份证号"
)
@Schema
(
description
=
"身份证号"
)
@ExcelProperty
(
"身份证号"
)
private
String
empIdcard
;
@ExcelAttribute
(
name
=
"员工手机号"
)
@Schema
(
description
=
"员工手机号"
)
@ExcelProperty
(
"员工手机号"
)
private
String
empPhone
;
@ExcelAttribute
(
name
=
"所属部门"
)
@Schema
(
description
=
"所属部门"
)
@ExcelProperty
(
"所属部门"
)
private
String
empDeptname
;
@ExcelAttribute
(
name
=
"就职岗位"
)
@Schema
(
description
=
"就职岗位"
)
@ExcelProperty
(
"就职岗位"
)
private
String
position
;
@ExcelAttribute
(
name
=
"登记类型"
)
@Schema
(
description
=
"登记类型 1入职 2离职"
)
@ExcelProperty
(
"登记类型"
)
private
String
feedbackType
;
@ExcelAttribute
(
name
=
"入/离职日期"
,
isDate
=
true
)
@Schema
(
description
=
"入/离职日期"
)
@ExcelProperty
(
"入/离职日期"
)
private
Date
joinLeaveDate
;
@ExcelAttribute
(
name
=
"登记人"
)
@Schema
(
description
=
"登记人"
)
@ExcelProperty
(
"登记人"
)
private
String
registorUsername
;
@ExcelAttribute
(
name
=
"登记时间"
,
isDate
=
true
)
@Schema
(
description
=
"登记时间"
)
@ExcelProperty
(
"登记时间"
)
private
Date
createTime
;
@ExcelAttribute
(
name
=
"处理状态"
)
@Schema
(
description
=
"处理状态,0已接收,1未处理,2已处理"
)
@ExcelProperty
(
"处理状态"
)
private
String
processStatus
;
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationSearchVo.java
0 → 100644
View file @
98f39acd
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
/**
* 入离职登记表
*
* @author huych
* @date 2025-02-25 14:48:11
*/
@Data
public
class
EmployeeRegistrationSearchVo
extends
EmployeeRegistration
{
/**
* 多选导出或删除等操作
*/
@Schema
(
description
=
"选中ID,多个逗号分割"
)
private
String
ids
;
/**
* 创建时间区间 [开始时间,结束时间]
*/
@Schema
(
description
=
"创建时间区间"
)
private
LocalDateTime
[]
createTimes
;
/**
* @Author fxj
* 查询数据起
**/
@Schema
(
description
=
"查询limit 开始"
)
private
int
limitStart
;
/**
* @Author fxj
* 查询数据止
**/
@Schema
(
description
=
"查询limit 数据条数"
)
private
int
limitEnd
;
//开始时间(查询专用)
@Schema
(
description
=
"创建开始时间"
)
@TableField
(
exist
=
false
)
private
LocalDateTime
createTimeStart
;
//截止时间(查询专用)
@Schema
(
description
=
"创建截止时间"
)
@TableField
(
exist
=
false
)
private
LocalDateTime
createTimeEnd
;
//开始时间(查询专用)
@Schema
(
description
=
"入离职开始时间"
)
@TableField
(
exist
=
false
)
private
Date
joinTimeStart
;
//截止时间(查询专用)
@Schema
(
description
=
"入离职截止时间"
)
@TableField
(
exist
=
false
)
private
Date
joinTimeEnd
;
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationVo.java
0 → 100644
View file @
98f39acd
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* 入离职登记表
*
* @author huych
* @date 2025-02-25 14:48:11
*/
@Data
public
class
EmployeeRegistrationVo
extends
RowIndex
implements
Serializable
{
/**
* 员工姓名
*/
@NotBlank
(
message
=
"员工姓名 不能为空"
)
@Length
(
max
=
50
,
message
=
"员工姓名 不能超过50 个字符"
)
@ExcelAttribute
(
name
=
"员工姓名"
,
isNotEmpty
=
true
,
errorInfo
=
"员工姓名不能为空"
,
maxLength
=
50
)
@Schema
(
description
=
"员工姓名"
)
@ExcelProperty
(
"员工姓名"
)
private
String
employeeName
;
/**
* 身份证号
*/
@NotBlank
(
message
=
"身份证号不能为空"
)
@Length
(
max
=
18
,
message
=
"身份证号不能超过18 个字符"
)
@ExcelAttribute
(
name
=
"身份证号"
,
isNotEmpty
=
true
,
errorInfo
=
"身份证号不能为空"
,
maxLength
=
18
)
@Schema
(
description
=
"身份证号"
)
@ExcelProperty
(
"身份证号"
)
private
String
empIdcard
;
/**
* 员工手机号
*/
@NotBlank
(
message
=
"员工手机号 不能为空"
)
@Length
(
max
=
11
,
message
=
"员工手机号不能超过11 个字符"
)
@ExcelAttribute
(
name
=
"员工手机号"
,
isNotEmpty
=
true
,
errorInfo
=
"员工手机号不能为空"
,
maxLength
=
11
)
@Schema
(
description
=
"员工手机号"
)
@ExcelProperty
(
"员工手机号"
)
private
String
empPhone
;
/**
* 岗位
*/
@Length
(
max
=
50
,
message
=
"岗位不能超过50个字符"
)
@ExcelAttribute
(
name
=
"岗位"
,
maxLength
=
50
)
@Schema
(
description
=
"岗位"
)
@ExcelProperty
(
"岗位"
)
private
String
position
;
/**
* 反馈类型 1入职 2离职
*/
@ExcelAttribute
(
name
=
"反馈类型"
)
@Schema
(
description
=
"反馈类型"
)
@ExcelProperty
(
"反馈类型"
)
private
String
feedbackType
;
/**
* 入/离职日期
*/
@ExcelAttribute
(
name
=
"入/离职日期"
,
isDate
=
true
)
@Schema
(
description
=
"入/离职日期"
)
@ExcelProperty
(
"入/离职日期"
)
private
Date
joinLeaveDate
;
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/controller/EmployeeRegistrationController.java
0 → 100644
View file @
98f39acd
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
controller
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationService
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
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.log.annotation.SysLog
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
lombok.SneakyThrows
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
/**
* 入离职登记表
*
* @author huych
* @date 2025-02-25 14:48:11
*/
@RestController
@RequiredArgsConstructor
@RequestMapping
(
"/employeeregistration"
)
@Tag
(
name
=
"入离职登记表管理"
)
public
class
EmployeeRegistrationController
{
private
final
EmployeeRegistrationService
employeeRegistrationService
;
/**
* 简单分页查询
*
* @param page 分页对象
* @param employeeRegistration 入离职登记表
* @return
*/
@Operation
(
description
=
"简单分页查询"
)
@GetMapping
(
"/page"
)
public
R
<
IPage
<
EmployeeRegistration
>>
getEmployeeRegistrationPage
(
Page
<
EmployeeRegistration
>
page
,
EmployeeRegistrationSearchVo
employeeRegistration
)
{
return
new
R
<>(
employeeRegistrationService
.
getEmployeeRegistrationPage
(
page
,
employeeRegistration
));
}
/**
* 通过id查询入离职登记表
*
* @param id id
* @return R
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询:hasPermission(' ')"
)
@GetMapping
(
"/{id}"
)
public
R
<
EmployeeRegistration
>
getById
(
@PathVariable
(
"id"
)
String
id
)
{
return
R
.
ok
(
employeeRegistrationService
.
getById
(
id
));
}
/**
* 新增入离职登记表
*
* @param employeeRegistration 入离职登记表
* @return R
*/
@Operation
(
summary
=
"新增入离职登记表"
)
@SysLog
(
"新增入离职登记表"
)
@PostMapping
(
"/registAdd"
)
public
R
registAdd
(
@RequestBody
EmployeeRegistration
employeeRegistration
)
{
return
employeeRegistrationService
.
registAdd
(
employeeRegistration
);
}
/**
* 修改入离职登记表
*
* @param employeeRegistration 入离职登记表
* @return R
*/
@Operation
(
summary
=
"修改入离职登记表"
)
@SysLog
(
"修改入离职登记表"
)
@PostMapping
(
"/updateById"
)
public
R
updateById
(
@RequestBody
EmployeeRegistration
employeeRegistration
)
{
return
employeeRegistrationService
.
updateRegist
(
employeeRegistration
);
}
/**
* 修改入离职登记表
*
* @param employeeRegistration 入离职登记表
* @return R
*/
@Operation
(
summary
=
"确认接收"
)
@SysLog
(
"确认接收"
)
@PostMapping
(
"/confirmSubmit"
)
public
R
confirmSubmit
(
@RequestBody
EmployeeRegistration
employeeRegistration
)
{
return
employeeRegistrationService
.
confirmSubmit
(
employeeRegistration
);
}
/**
* 通过id删除入离职登记表
*
* @param id id
* @return R
*/
@Operation
(
summary
=
"通过id删除入离职登记表"
,
description
=
"通过id删除入离职登记表:hasPermission('csp_employeeregistration_del')"
)
@SysLog
(
"通过id删除入离职登记表"
)
@DeleteMapping
(
"/{id}"
)
@PreAuthorize
(
"@pms.hasPermission('csp_employeeregistration_del')"
)
public
R
<
Boolean
>
removeById
(
@PathVariable
String
id
)
{
return
R
.
ok
(
employeeRegistrationService
.
removeById
(
id
));
}
/**
* 入离职登记表 批量导入
*
* @author huych
* @date 2025-02-25 14:48:11
**/
@SneakyThrows
@Operation
(
description
=
"批量新增入离职登记表"
)
@SysLog
(
"批量新增入离职登记表"
)
@PostMapping
(
"/importListAdd"
)
public
R
<
List
<
ErrorMessage
>>
importListAdd
(
@RequestBody
MultipartFile
file
,
String
deptId
)
{
return
employeeRegistrationService
.
importDiy
(
file
.
getInputStream
(),
deptId
);
}
/**
* 入离职登记表 批量导出
*
* @author huych
* @date 2025-02-25 14:48:11
**/
@Operation
(
description
=
"导出入离职登记表"
)
@PostMapping
(
"/export"
)
public
void
export
(
HttpServletResponse
response
,
@RequestBody
EmployeeRegistrationSearchVo
searchVo
)
{
employeeRegistrationService
.
listExport
(
response
,
searchVo
);
}
/**
* 入离职登记表 批量导出
*
* @author huych
* @date 2025-02-25 14:48:11
**/
@Operation
(
description
=
"导出入离职待办任务"
)
@PostMapping
(
"/hrExport"
)
public
void
hrExport
(
HttpServletResponse
response
,
@RequestBody
EmployeeRegistrationSearchVo
searchVo
)
{
employeeRegistrationService
.
listHrExport
(
response
,
searchVo
);
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/mapper/EmployeeRegistrationMapper.java
0 → 100644
View file @
98f39acd
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationExportVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationHrExportVo
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
/**
* 入离职登记表
*
* @author huych
* @date 2025-02-25 14:48:11
*/
@Mapper
public
interface
EmployeeRegistrationMapper
extends
BaseMapper
<
EmployeeRegistration
>
{
/**
* 入离职登记表简单分页查询
* @param employeeRegistration 入离职登记表
* @return
*/
IPage
<
EmployeeRegistration
>
getEmployeeRegistrationPage
(
Page
<
EmployeeRegistration
>
page
,
@Param
(
"employeeRegistration"
)
EmployeeRegistrationSearchVo
employeeRegistration
);
long
selectExportCount
(
@Param
(
"employeeRegistration"
)
EmployeeRegistrationSearchVo
employeeRegistration
);
List
<
EmployeeRegistrationExportVo
>
selectExportList
(
@Param
(
"employeeRegistration"
)
EmployeeRegistrationSearchVo
employeeRegistration
);
List
<
EmployeeRegistrationHrExportVo
>
selectHrExportList
(
@Param
(
"employeeRegistration"
)
EmployeeRegistrationSearchVo
employeeRegistration
);
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/EmployeeRegistrationService.java
0 → 100644
View file @
98f39acd
package
com
.
yifu
.
cloud
.
plus
.
v1
.
csp
.
service
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.csp.entity.EmployeeRegistration
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.InputStream
;
import
java.util.List
;
/**
* 入离职登记表
*
* @author huych
* @date 2025-02-25 14:48:11
*/
public
interface
EmployeeRegistrationService
extends
IService
<
EmployeeRegistration
>
{
/**
* 入离职登记表简单分页查询
* @param employeeRegistration 入离职登记表
* @return
*/
IPage
<
EmployeeRegistration
>
getEmployeeRegistrationPage
(
Page
<
EmployeeRegistration
>
page
,
EmployeeRegistrationSearchVo
employeeRegistration
);
/**
* 入离职登记表导入
* @param inputStream 文件流
* @return
*/
R
<
List
<
ErrorMessage
>>
importDiy
(
InputStream
inputStream
,
String
deptId
);
/**
* 入离职登记新增
* @param registration 入离职登记
* @return
*/
R
registAdd
(
EmployeeRegistration
registration
);
/**
* 确认提交
* @param registration 入离职登记
* @return
*/
R
confirmSubmit
(
EmployeeRegistration
registration
);
/**
* 单个更新
* @param registration 入离职登记
* @return
*/
R
updateRegist
(
EmployeeRegistration
registration
);
/**
* 导出
* @param searchVo 入离职登记
* @return
*/
void
listExport
(
HttpServletResponse
response
,
EmployeeRegistrationSearchVo
searchVo
);
/**
* 代办列表导出
* @param searchVo 入离职登记
* @return
*/
void
listHrExport
(
HttpServletResponse
response
,
EmployeeRegistrationSearchVo
searchVo
);
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
0 → 100644
View file @
98f39acd
This diff is collapsed.
Click to expand it.
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationMapper.xml
0 → 100644
View file @
98f39acd
This diff is collapsed.
Click to expand it.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
98f39acd
...
@@ -138,7 +138,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -138,7 +138,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
R
<
TSalaryStandardSelectViewVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
archivesProperties
.
getAppUrl
(),
archivesProperties
.
getAppId
()
R
<
TSalaryStandardSelectViewVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
archivesProperties
.
getAppUrl
(),
archivesProperties
.
getAppId
()
,
"/temployeeproject/inner/getUnProjectEmpList"
,
voList
,
TSalaryStandardSelectViewVo
.
class
,
SecurityConstants
.
FROM_IN
);
,
"/temployeeproject/inner/getUnProjectEmpList"
,
voList
,
TSalaryStandardSelectViewVo
.
class
,
SecurityConstants
.
FROM_IN
);
// 结算主体
// 结算主体
TSalaryStandardSelectViewVo
viewVo
=
new
TSalaryStandardSelectViewVo
()
;
TSalaryStandardSelectViewVo
viewVo
;
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
)
{
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
)
{
viewVo
=
sdr
.
getData
();
viewVo
=
sdr
.
getData
();
}
else
{
}
else
{
...
...
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