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
0820230c
You need to sign in or sign up before continuing.
Commit
0820230c
authored
Aug 29, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.9-审核时间
parent
095c9697
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
TPreMainExportAllVO.java
...u/cloud/plus/v1/yifu/archives/vo/TPreMainExportAllVO.java
+8
-2
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+3
-1
TPreEmpMainMapper.xml
...hives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml
+2
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TPreMainExportAllVO.java
View file @
0820230c
...
@@ -34,10 +34,16 @@ public class TPreMainExportAllVO {
...
@@ -34,10 +34,16 @@ public class TPreMainExportAllVO {
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"状态"
)
private
String
field1
;
@ExcelProperty
(
value
=
"提交时间"
)
@ExcelProperty
(
value
=
"提交时间"
)
private
String
field2
;
private
String
field2
;
@ExcelProperty
(
value
=
"状态"
)
private
String
field1
;
@ExcelProperty
(
value
=
"审核人"
)
private
String
field64
;
@ExcelProperty
(
value
=
"审核通过时间"
)
private
String
field65
;
@ExcelProperty
(
value
=
"员工主码"
)
@ExcelProperty
(
value
=
"员工主码"
)
private
String
field3
;
private
String
field3
;
@ExcelProperty
(
value
=
"员工类型"
)
@ExcelProperty
(
value
=
"员工类型"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
0820230c
...
@@ -2222,8 +2222,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2222,8 +2222,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
else
{
}
else
{
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
// 这里 需要指定写用哪个class去写,然后写到第一个sheet,然后文件流会自动关闭
List
<
List
<
String
>>
headList
=
Lists
.
newArrayList
();
List
<
List
<
String
>>
headList
=
Lists
.
newArrayList
();
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"状态"
,
"状态"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"提交时间"
,
"提交时间"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"提交时间"
,
"提交时间"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"状态"
,
"状态"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"审核人"
,
"审核人"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"审核通过时间"
,
"审核通过时间"
}));
String
oneTitle
=
"员工基本信息"
;
String
oneTitle
=
"员工基本信息"
;
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"员工主码"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"员工主码"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"员工类型"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"员工类型"
}));
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml
View file @
0820230c
...
@@ -292,7 +292,8 @@
...
@@ -292,7 +292,8 @@
<select
id=
"getTPreEmpMainAllList"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.vo.TPreMainExportAllVO"
>
<select
id=
"getTPreEmpMainAllList"
resultType=
"com.yifu.cloud.plus.v1.yifu.archives.vo.TPreMainExportAllVO"
>
SELECT
SELECT
case a.STATUS when '0' then '草稿' when '1' then '待完善' when '2' then '待审核' when '3' then '审核不通过' when '4' then '审核通过' else '-' end field1
case a.STATUS when '0' then '草稿' when '1' then '待完善' when '2' then '待审核' when '3' then '审核不通过' when '4' then '审核通过' else '-' end field1
,DATE_FORMAT(a.create_time,'%Y-%m-%d') field2,e.EMP_CODE field3,emp_natrue.label field4,a.emp_name field5,a.emp_idcard field6
,DATE_FORMAT(a.create_time,'%Y-%m-%d %H:%i:%s') field2,a.AUDIT_NAME field64,DATE_FORMAT(a.AUDIT_TIME,'%Y-%m-%d %H:%i:%s') field65
,e.EMP_CODE field3,emp_natrue.label field4,a.emp_name field5,a.emp_idcard field6
,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7
,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7
,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30','长期','固定')) field8 ,e.VALIDITY_START field9
,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30','长期','固定')) field8 ,e.VALIDITY_START field9
,if(e.VALIDITY_END > '2999-12-30','长期',e.VALIDITY_END) field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12 ,emp_married.label field13,nation.label field14
,if(e.VALIDITY_END > '2999-12-30','长期',e.VALIDITY_END) field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12 ,emp_married.label field13,nation.label field14
...
...
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