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
6f1b7281
Commit
6f1b7281
authored
Oct 25, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.0 优化
parent
a654e4a3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
2 deletions
+35
-2
TCompleteMonitorServiceImpl.java
...fu/archives/service/impl/TCompleteMonitorServiceImpl.java
+13
-1
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+21
-1
DiyExcelImportUtil.java
...oud/plus/v1/yifu/common/core/util/DiyExcelImportUtil.java
+1
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java
View file @
6f1b7281
...
...
@@ -275,6 +275,12 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
exportLimit
.
setCreateBy
(
user
.
getId
());
exportLimit
.
setType
(
CommonConstants
.
TWO_INT
);
List
<
TArchivesExportLimit
>
limitList
=
tArchivesExportLimitMapper
.
getLimitList
(
exportLimit
);
boolean
myExport
=
false
;
for
(
TArchivesExportLimit
limit1
:
limitList
)
{
if
(
limit1
.
getCreateBy
().
equals
(
user
.
getId
()))
{
myExport
=
true
;
}
}
String
name
=
"档案完整度监控详情"
;
String
fileName
=
name
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
//获取要导出的列表
...
...
@@ -293,12 +299,18 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
List
<
List
<
String
>>
headList
=
Lists
.
newArrayList
();
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"提示"
}));
EasyExcelFactory
.
write
(
out
).
head
(
headList
).
sheet
(
"数据超限"
).
doWrite
(
strList
);
}
else
if
(
myExport
)
{
List
<
List
<
String
>>
strList
=
new
ArrayList
<>();
strList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"您正在导出,请耐心等待10分钟后再导出!"
}));
List
<
List
<
String
>>
headList
=
Lists
.
newArrayList
();
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"提示"
}));
EasyExcelFactory
.
write
(
out
).
head
(
headList
).
sheet
(
"您正在导出完整度"
).
doWrite
(
strList
);
}
else
if
(
limitList
!=
null
&&
limitList
.
size
()
>
2
)
{
List
<
List
<
String
>>
strList
=
new
ArrayList
<>();
strList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"多人正在导出,请耐心等待10分钟后再导出!"
}));
List
<
List
<
String
>>
headList
=
Lists
.
newArrayList
();
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"提示"
}));
EasyExcelFactory
.
write
(
out
).
head
(
headList
).
sheet
(
"多人正在导出"
).
doWrite
(
strList
);
EasyExcelFactory
.
write
(
out
).
head
(
headList
).
sheet
(
"多人正在导出
完整度
"
).
doWrite
(
strList
);
}
else
{
exportLimit
.
setDeleteFlag
(
CommonConstants
.
ZERO_INT
);
exportLimit
.
setCreateName
(
user
.
getNickname
());
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
6f1b7281
...
...
@@ -2398,6 +2398,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
exportLimit
.
setCreateBy
(
user
.
getId
());
exportLimit
.
setType
(
CommonConstants
.
ONE_INT
);
List
<
TArchivesExportLimit
>
limitList
=
tArchivesExportLimitMapper
.
getLimitList
(
exportLimit
);
boolean
myExport
=
false
;
for
(
TArchivesExportLimit
limit1
:
limitList
)
{
if
(
limit1
.
getCreateBy
().
equals
(
user
.
getId
()))
{
myExport
=
true
;
}
}
String
name
=
"预入职导出全量"
;
String
fileName
=
name
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
//获取要导出的列表
...
...
@@ -2416,12 +2422,18 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List
<
List
<
String
>>
headList
=
Lists
.
newArrayList
();
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"提示"
}));
EasyExcelFactory
.
write
(
out
).
head
(
headList
).
sheet
(
"数据超限"
).
doWrite
(
strList
);
}
else
if
(
myExport
)
{
List
<
List
<
String
>>
strList
=
new
ArrayList
<>();
strList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"您正在导出,请耐心等待10分钟后再导出!"
}));
List
<
List
<
String
>>
headList
=
Lists
.
newArrayList
();
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"提示"
}));
EasyExcelFactory
.
write
(
out
).
head
(
headList
).
sheet
(
"您正在导出预入职"
).
doWrite
(
strList
);
}
else
if
(
limitList
!=
null
&&
limitList
.
size
()
>
2
)
{
List
<
List
<
String
>>
strList
=
new
ArrayList
<>();
strList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"多人正在导出,请耐心等待10分钟后再导出!"
}));
List
<
List
<
String
>>
headList
=
Lists
.
newArrayList
();
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
"提示"
}));
EasyExcelFactory
.
write
(
out
).
head
(
headList
).
sheet
(
"多人正在导出"
).
doWrite
(
strList
);
EasyExcelFactory
.
write
(
out
).
head
(
headList
).
sheet
(
"多人正在导出
预入职
"
).
doWrite
(
strList
);
}
else
{
exportLimit
.
setDeleteFlag
(
CommonConstants
.
ZERO_INT
);
exportLimit
.
setCreateName
(
user
.
getNickname
());
...
...
@@ -2984,6 +2996,14 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isNotNull
(
detail
.
getEmpPhone
()))
{
mobileList
.
add
(
detail
.
getEmpPhone
());
}
// 手机号码(紧急联系人)
if
(
Common
.
isNotNull
(
detail
.
getTel
()))
{
mobileList
.
add
(
detail
.
getTel
());
}
// 手机号码(家庭成员)
if
(
Common
.
isNotNull
(
detail
.
getContractTel
()))
{
mobileList
.
add
(
detail
.
getContractTel
());
}
}
StringBuilder
errorInfo
=
new
StringBuilder
();
if
(
errorMust
.
length
()
>
0
)
{
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/DiyExcelImportUtil.java
View file @
6f1b7281
...
...
@@ -201,6 +201,7 @@ public class DiyExcelImportUtil implements Serializable {
if
(
Common
.
isEmpty
(
idCardValue
))
{
idCardNullNum
++;
}
else
{
idCardNullNum
=
0
;
contentList
.
add
(
contentMap
);
}
/*if (Common.isNotNull(idCardValue) && (regIdCard(idCardValue)
...
...
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