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
cf982b00
Commit
cf982b00
authored
Aug 09, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.5.7-王镇彬的-通讯补贴异常
parent
a884e6a6
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
10 deletions
+9
-10
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+9
-10
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
cf982b00
...
@@ -141,6 +141,8 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -141,6 +141,8 @@ public class SalaryAccountUtil implements Serializable {
List
<
TSalaryEmployee
>
newEmpList
=
new
ArrayList
<>();
List
<
TSalaryEmployee
>
newEmpList
=
new
ArrayList
<>();
Map
<
String
,
TSalaryAccountVo
>
entityMap
=
new
HashMap
<>();
Map
<
String
,
TSalaryAccountVo
>
entityMap
=
new
HashMap
<>();
List
<
String
>
otherIdCard
=
new
ArrayList
<>();
List
<
String
>
otherIdCard
=
new
ArrayList
<>();
BigDecimal
phoneSubsidyMoney
;
TSalaryAccountItem
phoneSubsidyItem
;
for
(
int
i
=
0
;
i
<
rows
;
i
++)
{
for
(
int
i
=
0
;
i
<
rows
;
i
++)
{
annualBonusFlag
=
false
;
annualBonusFlag
=
false
;
errorFlag
=
true
;
errorFlag
=
true
;
...
@@ -179,9 +181,8 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -179,9 +181,8 @@ public class SalaryAccountUtil implements Serializable {
annualBonusFlag
=
true
;
annualBonusFlag
=
true
;
}
}
if
(
SalaryConstants
.
PHONE_SUBSIDY_JAVA
.
equals
(
scs
.
getJavaFiedName
()))
{
if
(
SalaryConstants
.
PHONE_SUBSIDY_JAVA
.
equals
(
scs
.
getJavaFiedName
()))
{
phoneSubsidyMoney
=
NumberUtils
.
createBigDecimal
(
cellValueStr
);
BigDecimal
bigDecimal1
=
NumberUtils
.
createBigDecimal
(
cellValueStr
);
if
(
phoneSubsidyMoney
.
compareTo
(
new
BigDecimal
(
"300"
))
>
0
)
{
if
(
bigDecimal1
.
compareTo
(
BigDecimal
.
valueOf
(
300
))
==
1
)
{
errorFlag
=
false
;
errorFlag
=
false
;
error
=
"第"
+
(
i
+
2
)
+
"行:本次发放"
+
cellValueStr
+
"元,超出300元的限制,禁止导入"
;
error
=
"第"
+
(
i
+
2
)
+
"行:本次发放"
+
cellValueStr
+
"元,超出300元的限制,禁止导入"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
...
@@ -371,15 +372,13 @@ public class SalaryAccountUtil implements Serializable {
...
@@ -371,15 +372,13 @@ public class SalaryAccountUtil implements Serializable {
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
continue
;
}
}
TSalaryAccountItem
item
=
tSalaryEmployeeService
.
selectByIdcard
(
newEmp
.
getEmpIdcard
(),
nowMonth
);
if
(
Common
.
isNotNull
(
phoneSubsidy
))
{
if
(
Common
.
isNotNull
(
item
))
{
phoneSubsidyItem
=
tSalaryEmployeeService
.
selectByIdcard
(
newEmp
.
getEmpIdcard
(),
nowMonth
);
BigDecimal
LL
=
item
.
getSalaryMoney
().
add
(
phoneSubsidy
);
if
(
phoneSubsidyItem
!=
null
&&
Common
.
isNotNull
(
phoneSubsidyItem
.
getSalaryMoney
())
if
(
LL
.
compareTo
(
BigDecimal
.
valueOf
(
300
))
==
1
)
{
&&
(
phoneSubsidyItem
.
getSalaryMoney
().
add
(
phoneSubsidy
)).
compareTo
(
new
BigDecimal
(
"300"
))
>
0
)
{
BigDecimal
HH
=
LL
.
subtract
(
phoneSubsidy
);
error
=
"第"
+
(
i
+
2
)
+
"行:当月已发"
+
phoneSubsidyItem
.
getSalaryMoney
()
+
"元,本次发放"
+
phoneSubsidy
+
"元,累计超出300元限制,禁止发放!"
;
error
=
"第"
+
(
i
+
2
)
+
"行:当月已发"
+
HH
+
"元,本次发放"
+
phoneSubsidy
+
"元,累计超出300元限制,禁止发放!"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
continue
;
}
}
}
}
if
(
annualBonusFlag
&&
Common
.
isEmpty
(
entity
.
getAnnualBonusType
()))
{
if
(
annualBonusFlag
&&
Common
.
isEmpty
(
entity
.
getAnnualBonusType
()))
{
...
...
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