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
e7cc5490
Commit
e7cc5490
authored
Jul 24, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.7' into MVP1.6.7
parents
adab231f
ec7abdf0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
EkpSalaryInfoServiceImpl.java
...ud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java
+2
-2
EkpSalaryInfoMapper.xml
...ekp-biz/src/main/resources/mapper/EkpSalaryInfoMapper.xml
+2
-2
No files found.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java
View file @
e7cc5490
...
...
@@ -363,7 +363,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
info
=
baseMapper
.
getClaimInfoByDeptNo
(
deptNo
,
"3"
);
if
(
Optional
.
ofNullable
(
info
).
isPresent
())
{
if
(
info
.
getSurMoney
().
add
(
money
).
compareTo
(
BigDecimal
.
ZERO
)
>=
0
)
{
info
.
setAdjustMoney
(
money
.
negate
()
);
info
.
setAdjustMoney
(
money
);
info
.
setAfterAdjustMoney
(
BigDecimalUtils
.
safeAdd
(
info
.
getSurMoney
(),
money
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
info
.
getErrorInfo
(),
info
));
}
else
{
...
...
@@ -387,7 +387,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
for
(
ClaimRebackInfotVO
subInfo
:
infoList
)
{
//分批去减去金额
if
(
subInfo
.
getSurMoney
().
add
(
money
).
compareTo
(
BigDecimal
.
ZERO
)
>=
0
)
{
subInfo
.
setAdjustMoney
(
money
.
negate
()
);
subInfo
.
setAdjustMoney
(
money
);
subInfo
.
setAfterAdjustMoney
(
BigDecimalUtils
.
safeAdd
(
subInfo
.
getSurMoney
(),
money
));
money
=
BigDecimal
.
ZERO
;
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
subInfo
.
getErrorInfo
(),
subInfo
));
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpSalaryInfoMapper.xml
View file @
e7cc5490
...
...
@@ -153,9 +153,9 @@
<!--根据项目编码和申请人查询款项认领明细-->
<select
id=
"getClaimInfoByDeptNo"
resultType=
"com.yifu.cloud.plus.v1.ekp.vo.ClaimRebackInfotVO"
>
select
fd_3afb4c634ebd08 claimNo,
fd_3afb4689209aa2 deptNo,
fd_3afb468b23b0e2 deptName,
fd_3afb4c634ebd08 claimNo,
fd_3afb46ab98d9a8 claimMoney,
fd_3afb46ac507904 cancelMoney,
ifnull(fd_3afb46d05d19ec,0) surMoney,
...
...
@@ -179,9 +179,9 @@
<!--根据项目编码和申请人查询款项认领明细-->
<select
id=
"getClaimBigInfoByDeptNoAndUser"
resultType=
"com.yifu.cloud.plus.v1.ekp.vo.ClaimRebackInfotVO"
>
select
fd_3afb4c634ebd08 claimNo,
fd_3afb4689209aa2 deptNo,
fd_3afb468b23b0e2 deptName,
fd_3afb4c634ebd08 claimNo,
fd_3afb46ab98d9a8 claimMoney,
fd_3afb46ac507904 cancelMoney,
ifnull(fd_3afb46d05d19ec,0) surMoney,
...
...
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