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
a6e41457
Commit
a6e41457
authored
Jan 16, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
c4164d70
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
TVacationInfoServiceImpl.java
...iness/service/vacation/impl/TVacationInfoServiceImpl.java
+3
-4
No files found.
yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/service/vacation/impl/TVacationInfoServiceImpl.java
View file @
a6e41457
...
@@ -168,6 +168,9 @@ implements TVacationInfoService {
...
@@ -168,6 +168,9 @@ implements TVacationInfoService {
}
}
if
(!
CollUtil
.
isEmpty
(
list
))
{
if
(!
CollUtil
.
isEmpty
(
list
))
{
errorMessageList
.
addAll
(
Common
.
commonImportErrorMessage
(
list
));
errorMessageList
.
addAll
(
Common
.
commonImportErrorMessage
(
list
));
if
(!
errorMessageList
.
isEmpty
())
{
return
R
.
failed
(
errorMessageList
,
"数据校验失败"
);
}
List
<
TBusinessEmployeeExtendInfo
>
employeeExtentList
=
new
ArrayList
<>();
List
<
TBusinessEmployeeExtendInfo
>
employeeExtentList
=
new
ArrayList
<>();
List
<
TBusDept
>
busDeptList
=
busDeptService
.
list
();
List
<
TBusDept
>
busDeptList
=
busDeptService
.
list
();
R
<
TBusinessDataListVo
>
sdRes
=
archivesDaprUtil
.
getAllExtendList
();
R
<
TBusinessDataListVo
>
sdRes
=
archivesDaprUtil
.
getAllExtendList
();
...
@@ -200,7 +203,6 @@ implements TVacationInfoService {
...
@@ -200,7 +203,6 @@ implements TVacationInfoService {
return
R
.
failed
(
errorMessageList
,
BusinessResultErrorMsg
.
SYS_ITEM_NOT_EXIST
);
return
R
.
failed
(
errorMessageList
,
BusinessResultErrorMsg
.
SYS_ITEM_NOT_EXIST
);
}
}
TBusinessEmployeeExtendInfo
businessEmployeeExtend
;
TBusinessEmployeeExtendInfo
businessEmployeeExtend
;
ErrorMessage
errorMessage
;
for
(
int
i
=
0
;
i
<
size
;
i
++)
{
for
(
int
i
=
0
;
i
<
size
;
i
++)
{
int
line
=
i
+
2
;
int
line
=
i
+
2
;
TVacationInfo
entity
=
new
TVacationInfo
();
TVacationInfo
entity
=
new
TVacationInfo
();
...
@@ -212,9 +214,6 @@ implements TVacationInfoService {
...
@@ -212,9 +214,6 @@ implements TVacationInfoService {
}
}
TBusDept
busDept
=
busDeptMap
.
get
(
businessEmployeeExtend
.
getDepartName
());
TBusDept
busDept
=
busDeptMap
.
get
(
businessEmployeeExtend
.
getDepartName
());
boolean
isSave
=
true
;
boolean
isSave
=
true
;
if
(!
errorMessageList
.
isEmpty
())
{
continue
;
}
if
(
Common
.
isEmpty
(
sysMap
.
get
(
dto
.
getVacationType
())))
{
if
(
Common
.
isEmpty
(
sysMap
.
get
(
dto
.
getVacationType
())))
{
errorMessageList
.
add
(
new
ErrorMessage
(
line
,
BusinessResultErrorMsg
.
VACATION_TYPE_DATA_NOT_EXIST
,
CommonConstants
.
RED
));
errorMessageList
.
add
(
new
ErrorMessage
(
line
,
BusinessResultErrorMsg
.
VACATION_TYPE_DATA_NOT_EXIST
,
CommonConstants
.
RED
));
isSave
=
false
;
isSave
=
false
;
...
...
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