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
0447abe9
Commit
0447abe9
authored
Nov 12, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.1 优化薪资提示语
parent
f7df12c1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+2
-1
TSalaryStandardOriginalServiceImpl.java
...lary/service/impl/TSalaryStandardOriginalServiceImpl.java
+1
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
0447abe9
...
...
@@ -115,6 +115,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
return
this
.
salaryUploadCore
(
vo
);
}
catch
(
Exception
e
){
log
.
error
(
"薪资导入异常:"
,
e
);
return
R
.
failed
(
"薪资导入异常,请检查表数据"
);
}
finally
{
importTwoAtomicInteger
.
decrementAndGet
();
}
...
...
@@ -124,7 +125,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
log
.
error
(
"超出阈值:"
+
ResultConstants
.
IMPORT_DOWN_LOAD_DATA
);
return
R
.
failed
(
"薪资导入,"
+
ResultConstants
.
IMPORT_DOWN_LOAD_DATA
);
}
return
R
.
failed
(
"薪资导入,"
+
ResultConstants
.
IMPORT_DOWN_LOAD_DATA
);
}
private
R
<
List
<
ErrorMessage
>>
salaryUploadCore
(
SalaryUploadParamVo
vo
)
{
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @
0447abe9
...
...
@@ -804,6 +804,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
return
this
.
getExcelContent
(
file
,
excelVo
);
}
catch
(
Exception
e
){
log
.
error
(
"薪资原表识别异常:"
,
e
);
return
R
.
failed
(
"薪资原表识别异常,请检查表数据"
);
}
finally
{
importAtomicInteger
.
decrementAndGet
();
}
...
...
@@ -813,7 +814,6 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
log
.
error
(
"超出阈值:"
+
ResultConstants
.
IMPORT_DOWN_LOAD_DATA
);
return
R
.
failed
(
"薪资原表识别,"
+
ResultConstants
.
IMPORT_DOWN_LOAD_DATA
);
}
return
R
.
failed
(
"薪资原表识别中,"
+
ResultConstants
.
IMPORT_DOWN_LOAD_DATA
);
}
/**
...
...
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