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
e2321c75
Commit
e2321c75
authored
Mar 17, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入离职登记提交
parent
48e0fb6b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
14 deletions
+14
-14
EmployeeRegistrationPreExportVo.java
.../v1/yifu/archives/vo/EmployeeRegistrationPreExportVo.java
+2
-0
EmployeeRegistrationPreSearchVo.java
.../v1/yifu/archives/vo/EmployeeRegistrationPreSearchVo.java
+0
-5
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+7
-6
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+5
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreExportVo.java
View file @
e2321c75
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
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.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
@@ -17,6 +18,7 @@ import java.util.Date;
...
@@ -17,6 +18,7 @@ import java.util.Date;
* @date 2025-03-12 17:14:19
* @date 2025-03-12 17:14:19
*/
*/
@Data
@Data
@ColumnWidth
(
17
)
public
class
EmployeeRegistrationPreExportVo
implements
Serializable
{
public
class
EmployeeRegistrationPreExportVo
implements
Serializable
{
@ExcelAttribute
(
name
=
"项目名称"
)
@ExcelAttribute
(
name
=
"项目名称"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreSearchVo.java
View file @
e2321c75
...
@@ -7,7 +7,6 @@ import lombok.Data;
...
@@ -7,7 +7,6 @@ import lombok.Data;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
/**
/**
* 入职待建档表
* 入职待建档表
...
@@ -52,8 +51,4 @@ public class EmployeeRegistrationPreSearchVo extends EmployeeRegistrationPre {
...
@@ -52,8 +51,4 @@ public class EmployeeRegistrationPreSearchVo extends EmployeeRegistrationPre {
@Schema
(
description
=
"列表类型 1 待办 2监控"
)
@Schema
(
description
=
"列表类型 1 待办 2监控"
)
private
String
type
;
private
String
type
;
@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/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
e2321c75
...
@@ -30,9 +30,7 @@ import org.springframework.stereotype.Service;
...
@@ -30,9 +30,7 @@ import org.springframework.stereotype.Service;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.net.URLEncoder
;
import
java.net.URLEncoder
;
import
java.util.ArrayList
;
import
java.util.*
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* 入职待建档表
* 入职待建档表
...
@@ -61,7 +59,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -61,7 +59,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
initSearchVo
(
employeeRegistrationPre
);
initSearchVo
(
employeeRegistrationPre
);
if
(
Common
.
isEmpty
(
employeeRegistrationPre
.
getStatusList
())
if
(
Common
.
isEmpty
(
employeeRegistrationPre
.
getStatusList
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeRegistrationPre
.
getType
()))
{
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeRegistrationPre
.
getType
()))
{
employeeRegistrationPre
.
setStatusList
(
CommonConstants
.
processPreStatus
);
employeeRegistrationPre
.
setStatusList
(
CommonConstants
.
processPre
Archives
Status
);
}
}
return
baseMapper
.
getEmployeeRegistrationPrePage
(
page
,
employeeRegistrationPre
);
return
baseMapper
.
getEmployeeRegistrationPrePage
(
page
,
employeeRegistrationPre
);
}
}
...
@@ -78,7 +76,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -78,7 +76,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
List
<
EmployeeRegistrationPreExportVo
>
list
=
new
ArrayList
<>();
List
<
EmployeeRegistrationPreExportVo
>
list
=
new
ArrayList
<>();
//权限赋值
//权限赋值
initSearchVo
(
searchVo
);
initSearchVo
(
searchVo
);
if
(
Common
.
isEmpty
(
searchVo
.
getStatusList
()))
{
if
(
Common
.
isEmpty
(
searchVo
.
getStatusList
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
searchVo
.
getType
()))
{
searchVo
.
setStatusList
(
CommonConstants
.
processPreArchivesStatus
);
searchVo
.
setStatusList
(
CommonConstants
.
processPreArchivesStatus
);
}
}
long
count
=
baseMapper
.
selectExportCount
(
searchVo
);
long
count
=
baseMapper
.
selectExportCount
(
searchVo
);
...
@@ -92,10 +91,12 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -92,10 +91,12 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
Map
<
String
,
String
>
nameAndDicTypeMap
=
util
.
getConverterDicType
();
Map
<
String
,
String
>
nameAndDicTypeMap
=
util
.
getConverterDicType
();
// 获取所有字典对应的值
// 获取所有字典对应的值
Map
<
String
,
String
>
redisLabelMap
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
REDIS_DICT_LABLE
);
Map
<
String
,
String
>
redisLabelMap
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
REDIS_DICT_LABLE
);
Set
<
String
>
exportFields
=
new
HashSet
<>(
Arrays
.
asList
(
"deptName"
,
"deptNo"
,
"employeeName"
,
"empIdcard"
,
"empPhone"
,
"joinLeaveDate"
,
"empNature"
,
"contractType"
,
"dataSource"
,
"customerUsername"
,
"expectedCollectionTime"
,
"processStatus"
));
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
out
,
EmployeeRegistrationPreExportVo
.
class
)
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
out
,
EmployeeRegistrationPreExportVo
.
class
)
.
registerConverter
(
new
DictConverter
(
nameAndDicTypeMap
,
redisLabelMap
))
.
registerConverter
(
new
DictConverter
(
nameAndDicTypeMap
,
redisLabelMap
))
.
includeColumnFieldNames
(
searchVo
.
getExportFields
()
).
build
();
.
includeColumnFieldNames
(
exportFields
).
build
();
int
index
=
0
;
int
index
=
0
;
if
(
count
>
CommonConstants
.
ZERO_INT
){
if
(
count
>
CommonConstants
.
ZERO_INT
){
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
e2321c75
...
@@ -121,7 +121,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -121,7 +121,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
public
IPage
<
EmployeeRegistration
>
getHrConfirmEmployeeRegistrationPage
(
Page
<
EmployeeRegistration
>
page
,
EmployeeRegistrationSearchVo
employeeRegistration
)
{
public
IPage
<
EmployeeRegistration
>
getHrConfirmEmployeeRegistrationPage
(
Page
<
EmployeeRegistration
>
page
,
EmployeeRegistrationSearchVo
employeeRegistration
)
{
//权限和条件赋值
//权限和条件赋值
initSearchVo
(
employeeRegistration
);
initSearchVo
(
employeeRegistration
);
if
(
Common
Constants
.
ONE_STRING
.
equals
(
employeeRegistration
.
getType
()))
{
if
(
Common
.
isEmpty
(
employeeRegistration
.
getStatusList
()))
{
employeeRegistration
.
setStatusList
(
CommonConstants
.
processPreStatus
);
employeeRegistration
.
setStatusList
(
CommonConstants
.
processPreStatus
);
}
}
employeeRegistration
.
setTypeList
(
CommonConstants
.
processPreStatus
);
employeeRegistration
.
setTypeList
(
CommonConstants
.
processPreStatus
);
...
@@ -239,7 +239,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -239,7 +239,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//前端客服的所有项目权限赋值
//前端客服的所有项目权限赋值
initSearchVo
(
searchVo
);
initSearchVo
(
searchVo
);
//待办列表只查看未处理的数据
//待办列表只查看未处理的数据
searchVo
.
setStatusList
(
CommonConstants
.
processPreStatus
);
if
(
Common
.
isEmpty
(
searchVo
.
getStatusList
()))
{
searchVo
.
setStatusList
(
CommonConstants
.
processPreStatus
);
}
searchVo
.
setTypeList
(
CommonConstants
.
processPreStatus
);
searchVo
.
setTypeList
(
CommonConstants
.
processPreStatus
);
long
count
=
baseMapper
.
selectExportCount
(
searchVo
);
long
count
=
baseMapper
.
selectExportCount
(
searchVo
);
try
(
ServletOutputStream
out
=
response
.
getOutputStream
())
{
try
(
ServletOutputStream
out
=
response
.
getOutputStream
())
{
...
@@ -850,7 +852,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -850,7 +852,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
long
roleId
=
1839501715787390978L
;
long
roleId
=
1839501715787390978L
;
boolean
isSsc
=
this
.
haveRole
(
user
,
roleId
);
boolean
isSsc
=
this
.
haveRole
(
user
,
roleId
);
if
(
!
isSsc
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
user
.
getSystemFlag
()))
{
if
(
isSsc
||
CommonConstants
.
ZERO_STRING
.
equals
(
user
.
getSystemFlag
()))
{
searchVo
.
setAuthSql
(
null
);
searchVo
.
setAuthSql
(
null
);
return
;
return
;
}
}
...
...
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