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
29d1e1a4
Commit
29d1e1a4
authored
Jul 19, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.7' into MVP1.6.7
parents
518dda86
d4c1ec4b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
25 deletions
+16
-25
ClaimRebackInfotVO.java
...ava/com/yifu/cloud/plus/v1/ekp/vo/ClaimRebackInfotVO.java
+2
-2
EkpSalaryInfoServiceImpl.java
...ud/plus/v1/ekp/service/impl/EkpSalaryInfoServiceImpl.java
+9
-19
EkpSalaryInfoMapper.xml
...ekp-biz/src/main/resources/mapper/EkpSalaryInfoMapper.xml
+5
-4
No files found.
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/ClaimRebackInfotVO.java
View file @
29d1e1a4
...
@@ -10,7 +10,7 @@ import lombok.Data;
...
@@ -10,7 +10,7 @@ import lombok.Data;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.NotNull
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.
util.Dat
e
;
import
java.
time.LocalDateTim
e
;
/**
/**
* 款项认领差额费导入
* 款项认领差额费导入
...
@@ -96,7 +96,7 @@ public class ClaimRebackInfotVO implements Serializable {
...
@@ -96,7 +96,7 @@ public class ClaimRebackInfotVO implements Serializable {
@ExcelAttribute
(
name
=
"入账日期"
)
@ExcelAttribute
(
name
=
"入账日期"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"入账日期"
)
@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 @
29d1e1a4
...
@@ -334,10 +334,10 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
...
@@ -334,10 +334,10 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
money
=
excel
.
getMoney
();
money
=
excel
.
getMoney
();
deptName
=
excel
.
getDeptName
();
deptName
=
excel
.
getDeptName
();
ClaimRebackInfotVO
backInfo
=
new
ClaimRebackInfotVO
();
ClaimRebackInfotVO
backInfo
=
new
ClaimRebackInfotVO
();
if
(
money
.
compareTo
(
BigDecimal
.
ZERO
)
>=
0
)
{
//先找到彭超创建的款项认领明细
//先找到彭超创建的款项认领明细
info
=
baseMapper
.
getClaimInfoByDeptNo
(
deptNo
,
"1"
);
info
=
baseMapper
.
getClaimInfoByDeptNo
(
deptNo
,
"1"
);
//
if
(
money
.
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
//调整金额大于零的先找到彭超创建的款项认领明细直接加
//调整金额大于零的先找到彭超创建的款项认领明细直接加
if
(
Optional
.
ofNullable
(
info
).
isPresent
())
{
if
(
Optional
.
ofNullable
(
info
).
isPresent
())
{
info
.
setAdjustMoney
(
money
);
info
.
setAdjustMoney
(
money
);
...
@@ -362,7 +362,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
...
@@ -362,7 +362,7 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
//调整金额小于零的先找到剩余金额大于零的彭超创建的款项认领明细去扣减
//调整金额小于零的先找到剩余金额大于零的彭超创建的款项认领明细去扣减
info
=
baseMapper
.
getClaimInfoByDeptNo
(
deptNo
,
"3"
);
info
=
baseMapper
.
getClaimInfoByDeptNo
(
deptNo
,
"3"
);
if
(
Optional
.
ofNullable
(
info
).
isPresent
())
{
if
(
Optional
.
ofNullable
(
info
).
isPresent
())
{
if
(
BigDecimalUtils
.
safeAdd
(
info
.
getSurMoney
(),
money
).
compareTo
(
BigDecimal
.
ZERO
)
>=
0
)
{
if
(
info
.
getSurMoney
().
add
(
money
).
compareTo
(
BigDecimal
.
ZERO
)
>=
0
)
{
info
.
setAdjustMoney
(
money
);
info
.
setAdjustMoney
(
money
);
info
.
setAfterAdjustMoney
(
BigDecimalUtils
.
safeAdd
(
info
.
getSurMoney
(),
money
));
info
.
setAfterAdjustMoney
(
BigDecimalUtils
.
safeAdd
(
info
.
getSurMoney
(),
money
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
info
.
getErrorInfo
(),
info
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
info
.
getErrorInfo
(),
info
));
...
@@ -376,31 +376,21 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
...
@@ -376,31 +376,21 @@ public class EkpSalaryInfoServiceImpl extends ServiceImpl<EkpSalaryInfoMapper, E
}
}
}
}
/**
* @Description: 推送ekp时更改日期格式
* @Author: huyc
**/
public
String
dateStringInsert
(
String
month
)
{
StringBuilder
sb
=
new
StringBuilder
(
month
);
sb
.
insert
(
4
,
"-"
);
return
sb
.
toString
();
}
public
void
subSwitch
(
String
deptNo
,
ClaimRebackInfotVO
backInfo
,
List
<
ErrorMessage
>
errorMessageList
,
public
void
subSwitch
(
String
deptNo
,
ClaimRebackInfotVO
backInfo
,
List
<
ErrorMessage
>
errorMessageList
,
BigDecimal
money
,
String
deptName
,
ClaimInfotVO
excel
)
{
BigDecimal
money
,
String
deptName
,
ClaimInfotVO
excel
)
{
List
<
ClaimRebackInfotVO
>
infoList
=
baseMapper
.
getClaimBigInfoByDeptNoAndUser
(
deptNo
);
List
<
ClaimRebackInfotVO
>
infoList
=
baseMapper
.
getClaimBigInfoByDeptNoAndUser
(
deptNo
);
if
(
Optional
.
ofNullable
(
infoList
).
isPresent
())
{
if
(
Optional
.
ofNullable
(
infoList
).
isPresent
())
{
for
(
ClaimRebackInfotVO
subInfo
:
infoList
)
{
for
(
ClaimRebackInfotVO
subInfo
:
infoList
)
{
//分批去减去金额
//分批去减去金额
if
(
BigDecimalUtils
.
safeAdd
(
subInfo
.
getSurMoney
(),
money
).
compareTo
(
BigDecimal
.
ZERO
)
>=
0
)
{
if
(
subInfo
.
getSurMoney
().
add
(
money
).
compareTo
(
BigDecimal
.
ZERO
)
>=
0
)
{
subInfo
.
setAdjustMoney
(
money
);
subInfo
.
setAdjustMoney
(
money
);
subInfo
.
setAfterAdjustMoney
(
BigDecimalUtils
.
safe
Subtract
(
subInfo
.
getSurMoney
(),
money
));
subInfo
.
setAfterAdjustMoney
(
BigDecimalUtils
.
safe
Add
(
subInfo
.
getSurMoney
(),
money
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
subInfo
.
getErrorInfo
(),
subInfo
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
subInfo
.
getErrorInfo
(),
subInfo
));
break
;
break
;
}
else
{
}
else
{
subInfo
.
setAdjustMoney
(
subInfo
.
getSurMoney
()
);
subInfo
.
setAdjustMoney
(
money
);
subInfo
.
setAfterAdjustMoney
(
BigDecimal
.
ZERO
);
subInfo
.
setAfterAdjustMoney
(
BigDecimal
.
ZERO
);
money
=
BigDecimalUtils
.
safeAdd
(
subInfo
.
getSurMoney
(),
money
);
money
=
subInfo
.
getSurMoney
().
add
(
money
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
subInfo
.
getErrorInfo
(),
subInfo
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
subInfo
.
getErrorInfo
(),
subInfo
));
}
}
}
}
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/mapper/EkpSalaryInfoMapper.xml
View file @
29d1e1a4
...
@@ -158,8 +158,8 @@
...
@@ -158,8 +158,8 @@
fd_3afb4c634ebd08 claimNo,
fd_3afb4c634ebd08 claimNo,
fd_3afb46ab98d9a8 claimMoney,
fd_3afb46ab98d9a8 claimMoney,
fd_3afb46ac507904 cancelMoney,
fd_3afb46ac507904 cancelMoney,
fd_3afb46d05d19ec
surMoney,
ifnull(fd_3afb46d05d19ec,0)
surMoney,
DATE_FORMAT(fd_3b5f41db9fb154,'%Y-%m-%d')
claimTime
fd_3b5f41db9fb154
claimTime
from
from
ekp_94b6cd1535e4b34865c8
ekp_94b6cd1535e4b34865c8
where
where
...
@@ -184,13 +184,14 @@
...
@@ -184,13 +184,14 @@
fd_3afb4c634ebd08 claimNo,
fd_3afb4c634ebd08 claimNo,
fd_3afb46ab98d9a8 claimMoney,
fd_3afb46ab98d9a8 claimMoney,
fd_3afb46ac507904 cancelMoney,
fd_3afb46ac507904 cancelMoney,
fd_3afb46d05d19ec
surMoney,
ifnull(fd_3afb46d05d19ec,0)
surMoney,
DATE_FORMAT(fd_3b5f41db9fb154,'%Y-%m-%d')
claimTime
fd_3b5f41db9fb154
claimTime
from
from
ekp_94b6cd1535e4b34865c8
ekp_94b6cd1535e4b34865c8
where
where
fd_3afb4689209aa2 = #{deptNo}
fd_3afb4689209aa2 = #{deptNo}
and fd_3afb46d05d19ec > 0
and fd_3afb46d05d19ec > 0
and fd_3b2a70e26f520a != '1817fbe83899f5f34c1ee9b463bbf9c1'
order by fd_3b5f41db9fb154 asc
order by fd_3b5f41db9fb154 asc
</select>
</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