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
a5ddf7c9
Commit
a5ddf7c9
authored
Jul 19, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hyc-项目余额调整
parent
c7b11685
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
ClaimRebackInfotVO.java
...ava/com/yifu/cloud/plus/v1/ekp/vo/ClaimRebackInfotVO.java
+2
-2
EkpSalaryInfoServiceImpl.java
...ud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java
+3
-3
EkpSalaryInfoMapper.xml
...ekp-biz/src/main/resources/mapper/EkpSalaryInfoMapper.xml
+1
-0
No files found.
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/ClaimRebackInfotVO.java
View file @
a5ddf7c9
...
...
@@ -10,7 +10,7 @@ import lombok.Data;
import
javax.validation.constraints.NotNull
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.
util.Dat
e
;
import
java.
time.LocalDateTim
e
;
/**
* 款项认领差额费导入
...
...
@@ -96,7 +96,7 @@ public class ClaimRebackInfotVO implements Serializable {
@ExcelAttribute
(
name
=
"入账日期"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"入账日期"
)
private
Dat
e
claimTime
;
private
LocalDateTim
e
claimTime
;
/**
* 异常说明
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java
View file @
a5ddf7c9
...
...
@@ -334,10 +334,10 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
money
=
excel
.
getMoney
();
deptName
=
excel
.
getDeptName
();
ClaimRebackInfotVO
backInfo
=
new
ClaimRebackInfotVO
();
//先找到彭超创建的款项认领明细
info
=
baseMapper
.
getClaimInfoByDeptNo
(
deptNo
,
"1"
);
//
if
(
money
.
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
//先找到彭超创建的款项认领明细
info
=
baseMapper
.
getClaimInfoByDeptNo
(
deptNo
,
"1"
);
//调整金额大于零的先找到彭超创建的款项认领明细直接加
if
(
Optional
.
ofNullable
(
info
).
isPresent
())
{
info
.
setAdjustMoney
(
money
);
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpSalaryInfoMapper.xml
View file @
a5ddf7c9
...
...
@@ -191,6 +191,7 @@
where
fd_3afb4689209aa2 = #{deptNo}
and fd_3afb46d05d19ec > 0
and fd_3b2a70e26f520a != '1817fbe83899f5f34c1ee9b463bbf9c1'
order by fd_3b5f41db9fb154 asc
</select>
...
...
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