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
d216fe42
Commit
d216fe42
authored
Jun 27, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5
parents
68c607d3
e82b235b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
8 deletions
+26
-8
EmployeeContractExportVO.java
...ud/plus/v1/yifu/archives/vo/EmployeeContractExportVO.java
+5
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+19
-8
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+2
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractExportVO.java
View file @
d216fe42
...
@@ -251,6 +251,11 @@ public class EmployeeContractExportVO implements Serializable {
...
@@ -251,6 +251,11 @@ public class EmployeeContractExportVO implements Serializable {
@ExcelProperty
(
"创建人"
)
@ExcelProperty
(
"创建人"
)
private
String
createName
;
private
String
createName
;
@ExcelAttribute
(
name
=
"审核人"
)
@ExcelProperty
(
"审核人"
)
@Schema
(
description
=
"审核人"
)
private
String
auditUserName
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"创建时间"
)
@ExcelProperty
(
"创建时间"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
d216fe42
...
@@ -1440,17 +1440,28 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -1440,17 +1440,28 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractInfo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
contractInfo
.
setLimitEnd
(
CommonConstants
.
EXCEL_EXPORT_LIMIT
);
list
=
baseMapper
.
getTEmployeeContractExport
(
contractInfo
);
list
=
baseMapper
.
getTEmployeeContractExport
(
contractInfo
);
if
(
Common
.
isNotNull
(
list
))
{
if
(
Common
.
isNotNull
(
list
))
{
for
(
EmployeeContractExportVO
ll:
list
){
for
(
EmployeeContractExportVO
ll
:
list
)
{
if
(
ll
.
getAuditStatus
().
contains
(
"审核不通过"
))
{
if
(
ll
.
getRemark
()
!=
null
)
{
if
(
null
!=
ll
.
getRemark
())
{
if
(!
ll
.
getRemark
().
contains
(
"派增审核"
))
{
String
[]
a
=
ll
.
getRemark
().
split
(
":"
);
if
(
ll
.
getAuditStatus
().
contains
(
"审核不通过"
)
&&
null
!=
ll
.
getRemark
())
{
for
(
int
t
=
CommonConstants
.
ZERO_INT
;
t
<
a
.
length
;
t
++){
if
(
ll
.
getRemark
().
contains
(
":"
))
{
if
(
t
==
CommonConstants
.
ONE_INT
)
{
String
a
=
ll
.
getRemark
().
substring
(
0
,
ll
.
getRemark
().
indexOf
(
":"
,
1
));
ll
.
setNoPassReason
(
a
[
CommonConstants
.
ZERO_INT
]);
String
b
=
ll
.
getRemark
().
substring
(
ll
.
getRemark
().
indexOf
(
":"
,
1
)
+
1
);
ll
.
setRemark
(
a
[
CommonConstants
.
ONE_INT
]);
ll
.
setNoPassReason
(
a
);
ll
.
setRemark
(
b
);
}
}
}
}
}
}
if
(
ll
.
getRemark
().
contains
(
"派增审核"
))
{
if
(
ll
.
getRemark
().
contains
(
"-"
))
{
String
c
=
ll
.
getRemark
().
substring
(
0
,
ll
.
getRemark
().
indexOf
(
"-"
,
1
));
String
d
=
ll
.
getRemark
().
substring
(
ll
.
getRemark
().
indexOf
(
"-"
,
1
)
+
1
);
ll
.
setNoPassReason
(
c
);
ll
.
setRemark
(
d
);
}
}
}
}
}
}
writeSheet
=
EasyExcel
.
writerSheet
(
"员工合同"
+
index
).
build
();
writeSheet
=
EasyExcel
.
writerSheet
(
"员工合同"
+
index
).
build
();
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
d216fe42
...
@@ -213,6 +213,7 @@
...
@@ -213,6 +213,7 @@
a.EMP_NO,
a.EMP_NO,
a.EMP_NAME,
a.EMP_NAME,
a.EMP_IDCARD,
a.EMP_IDCARD,
a.AUDIT_USER_NAME,
a.CONTRACT_START,
a.CONTRACT_START,
a.CONTRACT_END,
a.CONTRACT_END,
a.FILE_PROVINCE,
a.FILE_PROVINCE,
...
@@ -476,6 +477,7 @@
...
@@ -476,6 +477,7 @@
a.EMP_IDCARD,
a.EMP_IDCARD,
a.CONTRACT_START,
a.CONTRACT_START,
a.CONTRACT_END,
a.CONTRACT_END,
a.AUDIT_USER_NAME,
a1.AREA_NAME as "FILE_PROVINCE",
a1.AREA_NAME as "FILE_PROVINCE",
a2.AREA_NAME as "FILE_CITY",
a2.AREA_NAME as "FILE_CITY",
a3.AREA_NAME as "FILE_TOWN",
a3.AREA_NAME as "FILE_TOWN",
...
...
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