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
81a3daba
You need to sign in or sign up before continuing.
Commit
81a3daba
authored
Nov 02, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权限配置页面
parent
fd751b49
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
263 additions
and
3 deletions
+263
-3
EmployeeContractExportAuditVO.java
...us/v1/yifu/archives/vo/EmployeeContractExportAuditVO.java
+232
-0
TEmployeeContractInfoController.java
.../archives/controller/TEmployeeContractInfoController.java
+17
-1
TEmployeeContractInfoService.java
...1/yifu/archives/service/TEmployeeContractInfoService.java
+8
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+5
-0
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractExportAuditVO.java
0 → 100644
View file @
81a3daba
/*
* 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.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.Size
;
import
java.io.Serializable
;
import
java.util.List
;
import
java.util.Set
;
/**
* 员工合同
*
* @author hgw
* @date 2022-06-29 20:45:22
*/
@Data
@ColumnWidth
(
10
)
public
class
EmployeeContractExportAuditVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
@Schema
(
description
=
"申请编号"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"申请编号"
)
private
String
applyNo
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"员工编码"
)
@Length
(
max
=
32
,
message
=
"员工编码不能超过32个字符"
)
@ExcelAttribute
(
name
=
"员工编码"
,
isNotEmpty
=
true
,
errorInfo
=
"员工编码不能为空"
,
maxLength
=
32
)
@Schema
(
description
=
"员工编码"
,
name
=
"empNo"
)
private
String
empNo
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"员工姓名"
)
@Length
(
max
=
32
,
message
=
"员工姓名不能超过32个字符"
)
@ExcelAttribute
(
name
=
"员工姓名"
,
maxLength
=
32
,
needExport
=
true
)
@Schema
(
description
=
"员工姓名"
,
name
=
"empName"
)
private
String
empName
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"身份证号"
)
@Length
(
max
=
32
,
message
=
"身份证号不能超过32个字符"
)
@ExcelAttribute
(
name
=
"身份证号"
,
maxLength
=
32
,
isIdCard
=
true
,
needExport
=
true
)
@Schema
(
description
=
"身份证号"
,
name
=
"empIdcard"
)
private
String
empIdcard
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同起始日期"
)
@NotBlank
(
message
=
"合同起始日期不能为空"
)
@ExcelAttribute
(
name
=
"合同起始日期"
,
isNotEmpty
=
true
,
errorInfo
=
"合同起始日期不能为空"
)
@Schema
(
description
=
"合同起始日期"
,
name
=
"contractStart"
)
private
String
contractStart
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同截止日期"
)
@ExcelAttribute
(
name
=
"合同截止日期"
,
needExport
=
true
)
@Schema
(
description
=
"合同截止日期"
,
name
=
"contractEnd"
)
private
String
contractEnd
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"档案-省"
)
@ExcelAttribute
(
name
=
"档案-省"
,
maxLength
=
32
,
isArea
=
true
)
@Schema
(
description
=
"档案-省"
,
name
=
"fileProvince"
)
private
String
fileProvince
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"档案-市"
)
@ExcelAttribute
(
name
=
"档案-市"
,
maxLength
=
32
,
isArea
=
true
,
parentField
=
"fileProvince"
)
@Schema
(
description
=
"档案-市"
,
name
=
"fileCity"
)
private
String
fileCity
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"档案-县"
)
@ExcelAttribute
(
name
=
"档案-县"
,
maxLength
=
32
,
isArea
=
true
,
parentField
=
"fileCity"
)
@Schema
(
description
=
"档案-县"
,
name
=
"fileTown"
)
private
String
fileTown
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"项目名称"
)
@Length
(
max
=
128
,
message
=
"项目名称不能超过128个字符"
)
@ExcelAttribute
(
name
=
"项目名称"
,
maxLength
=
128
)
@Schema
(
description
=
"项目名称"
,
name
=
"subjectDepart"
)
private
String
subjectDepart
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"项目编码"
)
@Schema
(
description
=
"项目编码"
)
private
String
deptNo
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"员工类型"
)
@ExcelAttribute
(
name
=
"员工类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_NATRUE
)
@Schema
(
description
=
"员工类型(字典值,0外包1派遣2代理3内部员工)"
)
private
String
empNatrue
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同类型"
)
@NotBlank
(
message
=
"合同类型不能为空"
)
@Length
(
max
=
32
,
message
=
"合同类型不能超过32个字符"
)
@ExcelAttribute
(
name
=
"合同类型"
,
isNotEmpty
=
true
,
errorInfo
=
"合同类型不能为空"
,
maxLength
=
32
,
needExport
=
true
)
@Schema
(
description
=
"合同类型"
,
name
=
"contractName"
)
private
String
contractName
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"业务细分"
)
@NotBlank
(
message
=
"业务细分不能为空"
)
@Length
(
max
=
32
,
message
=
"业务细分不能超过32个字符"
)
@ExcelAttribute
(
name
=
"业务细分"
,
maxLength
=
32
,
needExport
=
true
)
@Schema
(
description
=
"业务细分"
,
name
=
"contractName"
)
private
String
contractSubName
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"签订类型"
)
@NotBlank
(
message
=
"签订类型不能为空"
)
@Length
(
max
=
1
,
message
=
"签订类型不能超过1个字符"
)
@ExcelAttribute
(
name
=
"签订类型"
,
isNotEmpty
=
true
,
errorInfo
=
"签订类型不能为空"
,
maxLength
=
100
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMPLOYEE_SITUATION_TYPE
)
@Schema
(
description
=
"签订类型"
,
name
=
"situation"
)
private
String
situation
;
/**
* 签订期限employee_contract_type
* 0 已完成一定工作任务为期限
* 1 固定期限
* 2 无固定期限
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"签订期限"
)
@NotBlank
(
message
=
"签订期限不能为空"
)
@Length
(
max
=
32
,
message
=
"签订期限不能超过32个字符"
)
@ExcelAttribute
(
name
=
"签订期限"
,
isNotEmpty
=
true
,
errorInfo
=
"签订期限不能为空"
,
maxLength
=
32
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMPLOYEE_CONTRACT_TYPE
,
needExport
=
true
)
@Schema
(
description
=
"签订期限"
,
name
=
"contractType"
)
private
String
contractType
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同甲方"
)
@ExcelAttribute
(
name
=
"合同甲方"
)
@Schema
(
description
=
"合同甲方"
)
@Size
(
max
=
50
,
message
=
"合同甲方不可超过50位"
)
private
String
contractParty
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"客户名称"
)
@Length
(
max
=
128
,
message
=
"客户名称不能超过128个字符"
)
@ExcelAttribute
(
name
=
"客户名称"
,
maxLength
=
128
)
@Schema
(
description
=
"客户名称"
,
name
=
"subjectUnit"
)
private
String
subjectUnit
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"审核状态"
)
@ExcelAttribute
(
name
=
"审核状态"
,
readConverterExp
=
"0=待提交,1=待审核,2=审核通过,3=审核不通过"
)
@Schema
(
description
=
"审核状态"
)
private
String
auditStatus
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同状态"
)
@ExcelAttribute
(
name
=
"合同状态"
,
readConverterExp
=
"0=可用,1=不可用"
)
@Schema
(
description
=
"合同状态"
,
name
=
"inUse"
)
private
String
inUse
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"附件状态"
)
@ExcelAttribute
(
name
=
"附件状态"
)
@Schema
(
description
=
"附件状态"
,
name
=
"isFile"
)
private
String
files
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"归档状态"
)
@ExcelAttribute
(
name
=
"归档状态"
,
readConverterExp
=
"0=已归档,1=未归档"
)
@Schema
(
description
=
"归档状态"
,
name
=
"isFile"
)
private
String
isFile
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"创建人"
)
private
String
createName
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"创建时间"
)
private
String
createTime
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"累计签订次数"
)
private
String
createNum
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"首签日期"
)
private
String
startDate
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"最晚到期日期"
)
private
String
endDate
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"历次记录"
)
private
String
history
;
@TableField
(
exist
=
false
)
@Schema
(
description
=
"选中的idList"
)
private
List
<
String
>
idList
;
@TableField
(
exist
=
false
)
@Schema
(
description
=
"导出的表头的Set"
)
private
Set
<
String
>
exportFields
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractInfoController.java
View file @
81a3daba
...
...
@@ -276,7 +276,7 @@ public class TEmployeeContractInfoController {
}
/**
* 批量导出
人员档案信息
* 批量导出
合同
*
* @Author hgw
* @Date 2022-6-24 09:36:06
...
...
@@ -329,4 +329,20 @@ public class TEmployeeContractInfoController {
public
TEmployeeContractInfo
getContractById
(
@RequestBody
String
id
)
{
return
tEmployeeContractInfoService
.
getById
(
id
);
}
/**
* 批量导出合同审核
*
* @Author hgw
* @Date 2022-6-24 09:36:06
**/
@Operation
(
summary
=
"批量导出合同审核(记得传参mId)employee_export_contract"
,
description
=
"批量导出合同审核 hasPermission('employee_export_contract_audit')"
)
@SysLog
(
"批量导出合同审核"
)
@PostMapping
(
"/exportAuditContractInfo"
)
@PreAuthorize
(
"@pms.hasPermission('employee_export_contract_audit')"
)
public
void
exportAuditContractInfo
(
@RequestBody
(
required
=
false
)
TEmployeeContractInfo
contractInfo
,
HttpServletResponse
response
)
{
contractInfo
.
setAuditStatus
(
CommonConstants
.
ONE_INT
);
this
.
setAuth
(
contractInfo
);
tEmployeeContractInfoService
.
exportAuditContractInfo
(
contractInfo
,
response
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractInfoService.java
View file @
81a3daba
...
...
@@ -166,5 +166,12 @@ public interface TEmployeeContractInfoService extends IService<TEmployeeContract
* @return: void
**/
void
exportContractInfoHistory
(
TEmployeeContractInfo
contractInfo
,
HttpServletResponse
response
);
/**
* @Author fxj
* @Description 批量合同审核导出
* @Date 15:38 2022/11/2
* @Param
* @return
**/
void
exportAuditContractInfo
(
TEmployeeContractInfo
contractInfo
,
HttpServletResponse
response
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
81a3daba
...
...
@@ -983,4 +983,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
@Override
public
void
exportAuditContractInfo
(
TEmployeeContractInfo
contractInfo
,
HttpServletResponse
response
)
{
}
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
81a3daba
...
...
@@ -876,7 +876,7 @@
left join (
select p.UNIT_NAME,p.UNIT_NO,p.DEPT_ID,p.DEPT_NAME,p.DEPT_NO,p.POST,p.EMP_ID,p.EMP_NO,P.PROJECT_STATUS,p.EMP_NATRUE
from t_employee_project p
where 1=1
where 1=1
and p.DELETE_FLAG = '0'
<if
test=
"checkVo != null"
>
<if
test=
"checkVo.codes != null"
>
AND p.DEPT_NO in
...
...
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