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
c2bc5068
Commit
c2bc5068
authored
Apr 17, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.2-工资原表识别-优化
parent
1455e78c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
TSalaryStandardOriginalServiceImpl.java
...lary/service/impl/TSalaryStandardOriginalServiceImpl.java
+3
-3
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardOriginalServiceImpl.java
View file @
c2bc5068
...
...
@@ -745,7 +745,7 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
.
setScale
(
SalaryConstants
.
PLACES
,
BigDecimal
.
ROUND_HALF_UP
));
}
}
catch
(
NumberFormatException
e
)
{
return
R
.
failed
(
"第 "
+
i
+
" 行,第 "
+
(
Integer
.
parseInt
(
column
.
getKey
())
+
1
)
+
" 列 不是金额,不可以进行加减计算!"
);
return
R
.
failed
(
"
数据行
第 "
+
i
+
" 行,第 "
+
(
Integer
.
parseInt
(
column
.
getKey
())
+
1
)
+
" 列 不是金额,不可以进行加减计算!"
);
}
newRowMap
.
put
(
detail
.
getModelName
(),
value
);
if
(
SalaryConstants
.
ID_NUMBER
.
equals
(
detail
.
getModelName
()))
{
...
...
@@ -757,10 +757,10 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
}
}
if
(
Common
.
isEmpty
(
check
.
getIdCard
()))
{
return
R
.
failed
(
"第 "
+
i
+
" 行,无身份证号!"
);
return
R
.
failed
(
"
数据行
第 "
+
i
+
" 行,无身份证号!"
);
}
if
(
Common
.
isEmpty
(
check
.
getName
()))
{
return
R
.
failed
(
"第 "
+
i
+
" 行,无员工姓名!"
);
return
R
.
failed
(
"
数据行
第 "
+
i
+
" 行,无员工姓名!"
);
}
// 调用校验服务
...
...
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