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
171f3faa
You need to sign in or sign up before continuing.
Commit
171f3faa
authored
Jul 06, 2023
by
wangzb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature-wzb :档案和社保处Bug修复
parent
b1ac6569
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+13
-1
Common.java
.../com/yifu/cloud/plus/v1/yifu/common/core/util/Common.java
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
171f3faa
...
...
@@ -1351,6 +1351,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if
(
ll
.
getRemark
()
!=
null
)
{
if
(!
ll
.
getRemark
().
contains
(
"派增审核"
))
{
if
(
ll
.
getAuditStatus
().
contains
(
"审核不通过"
)
&&
null
!=
ll
.
getRemark
())
{
if
(!
ll
.
getRemark
().
contains
(
"-"
)&&!
ll
.
getRemark
().
contains
(
":"
)){
ll
.
setNoPassReason
(
ll
.
getRemark
());
ll
.
setRemark
(
""
);
}
if
(
ll
.
getRemark
().
contains
(
":"
))
{
String
a
=
ll
.
getRemark
().
substring
(
0
,
ll
.
getRemark
().
indexOf
(
":"
,
1
));
String
b
=
ll
.
getRemark
().
substring
(
ll
.
getRemark
().
indexOf
(
":"
,
1
)
+
1
);
...
...
@@ -1360,6 +1364,15 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
if
(
ll
.
getRemark
().
contains
(
"派增审核"
))
{
if
(
ll
.
getRemark
().
contains
(
":"
)&&!
ll
.
getRemark
().
contains
(
":"
)){
if
(
ll
.
getRemark
().
split
(
":"
).
length
==
2
){
int
indexOne
=
ll
.
getRemark
().
indexOf
(
":"
);
String
after1
=
ll
.
getRemark
().
substring
(
indexOne
+
1
);
ll
.
setNoPassReason
(
after1
);
ll
.
setRemark
(
""
);
}
}
if
(
ll
.
getRemark
().
contains
(
"-"
))
{
String
c
=
ll
.
getRemark
().
substring
(
0
,
ll
.
getRemark
().
indexOf
(
"-"
,
1
));
String
d
=
ll
.
getRemark
().
substring
(
ll
.
getRemark
().
indexOf
(
"-"
,
1
)
+
1
);
...
...
@@ -1368,7 +1381,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
}
}
writeSheet
=
EasyExcel
.
writerSheet
(
"员工合同"
+
index
).
build
();
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/Common.java
View file @
171f3faa
...
...
@@ -523,7 +523,7 @@ public class Common {
* @param null
* @return
**/
private
static
final
String
insuranceSuffixList
=
"pdf|png|jpg|doc|docx|xls|xlsx|rar|zip|txt"
;
private
static
final
String
insuranceSuffixList
=
"pdf|png|jpg|doc|docx|xls|xlsx|rar|zip|txt
|jpeg
"
;
/**
* 判断是否为允许的上传文件类型,true表示允许
...
...
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