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
9eb0d911
Commit
9eb0d911
authored
Oct 24, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.0 优化
parent
dc68e0a0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+3
-0
DiyExcelImportUtil.java
...oud/plus/v1/yifu/common/core/util/DiyExcelImportUtil.java
+11
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
9eb0d911
...
@@ -3370,6 +3370,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -3370,6 +3370,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
}
}
}
}
}
else
{
// 为空的检查一下起始时间有没有值,有值,截止日期不可为空
DiyExcelImportUtil
.
validateUtilEmpty
(
shuValue
,
attr
,
errorFormat
,
startDateMap
);
}
}
}
}
}
}
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/DiyExcelImportUtil.java
View file @
9eb0d911
...
@@ -714,6 +714,17 @@ public class DiyExcelImportUtil implements Serializable {
...
@@ -714,6 +714,17 @@ public class DiyExcelImportUtil implements Serializable {
return
tempStr
;
return
tempStr
;
}
}
// 为空的检查一下起始时间有没有值,有值,截止日期不可为空
public
static
void
validateUtilEmpty
(
String
c
,
ExcelAttribute
attr
,
StringBuilder
errorFormat
,
Map
<
String
,
Date
>
startDateMap
)
{
//非空校验
if
(
Common
.
isEmpty
(
c
)
&&
Common
.
isNotNull
(
attr
.
pattern
()))
{
Date
startDate
=
startDateMap
.
get
(
attr
.
pattern
());
if
(
startDate
!=
null
)
{
errorFormat
.
append
(
attr
.
name
()).
append
(
"_起始日期有值则截止日期必填;"
);
}
}
}
private
static
boolean
getMatchRes
(
String
c
,
ExcelAttribute
attr
,
String
pattern
)
{
private
static
boolean
getMatchRes
(
String
c
,
ExcelAttribute
attr
,
String
pattern
)
{
return
!
c
.
matches
(
Common
.
isEmpty
(
attr
.
pattern
())
?
pattern
:
attr
.
pattern
());
return
!
c
.
matches
(
Common
.
isEmpty
(
attr
.
pattern
())
?
pattern
:
attr
.
pattern
());
}
}
...
...
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