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
c9675ce8
You need to sign in or sign up before continuing.
Commit
c9675ce8
authored
Jul 30, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hyc-余额校验提示语优化
parent
3115af61
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
EkpSalaryInfoServiceImpl.java
...ud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java
+2
-1
No files found.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java
View file @
c9675ce8
...
...
@@ -346,6 +346,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
if
(
Common
.
isNotNull
(
deptInfo
)
&&
!
deptName
.
equals
(
deptInfo
.
getDeptName
()))
{
backInfo
.
setDeptName
(
deptName
);
backInfo
.
setDeptNo
(
deptNo
);
backInfo
.
setAdjustMoney
(
money
);
backInfo
.
setErrorInfo
(
"系统中的项目编码对应的项目名称和模板中不一致!"
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
backInfo
.
getErrorInfo
(),
backInfo
));
continue
;
...
...
@@ -399,7 +400,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
public
void
subSwitch
(
String
deptNo
,
ClaimRebackInfotVO
backInfo
,
List
<
ErrorMessage
>
errorMessageList
,
BigDecimal
money
,
String
deptName
,
ClaimInfotVO
excel
,
String
flag
)
{
List
<
ClaimRebackInfotVO
>
infoList
=
baseMapper
.
getClaimBigInfoByDeptNoAndUser
(
deptNo
);
if
(
Optional
.
ofNullable
(
infoList
).
isPresent
(
))
{
if
(
Common
.
isNotNull
(
infoList
))
{
for
(
ClaimRebackInfotVO
subInfo
:
infoList
)
{
//分批去减去金额
if
(
subInfo
.
getSurMoney
().
add
(
money
).
compareTo
(
BigDecimal
.
ZERO
)
>=
0
)
{
...
...
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