Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
Overview
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
reyun
manager
Commits
15d5a916
Commit
15d5a916
authored
Jun 03, 2020
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
e0ac8d7b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+5
-6
No files found.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
15d5a916
...
...
@@ -2419,7 +2419,7 @@ public class ContractServiceImpl implements ContractService {
//不含稅收入
//以下结果统一 *100
// Long excludTax = v.getMoney() * 6 / 100;
Long
excludTax
=
(
long
)
(
v
.
getMoney
()
*
100
*
0.06
);
Long
excludTax
=
v
.
getMoney
()
*
100
-
(
long
)
(
v
.
getMoney
()
*
100
*
0.06
);
v
.
setIncomeExcludingTax
(
excludTax
);
DateTime
formStart
=
new
DateTime
(
startDate
);
...
...
@@ -2450,9 +2450,10 @@ public class ContractServiceImpl implements ContractService {
//时间范围合同结束时间时 分两部分计算
//第一部分
intervalIncome
=
v
.
getIncomeExcludingTax
()
/
contracAllDays
*
(
contractFormRange
-
1
);
//第二部分
Long
intervalIncomePart2
=
(
long
)
(
v
.
getMoney
()
-
(
v
.
getMoney
()
*
100
/
contracAllDays
*
(
contracAllDays
-
1
))
*
1.0
/
100
)
*
100
;
//此处 除100 计算完成再扩大100倍
Long
intervalIncomePart2
=
(
long
)
(
v
.
getIncomeExcludingTax
()
*
1.0
/
100
-
((
v
.
getIncomeExcludingTax
()
*
1.0
/
100
/
contracAllDays
*
(
contracAllDays
-
1
))))
*
100
;
intervalIncome
+=
intervalIncomePart2
;
v
.
setIntervaIncomeShare
(
intervalIncome
);
...
...
@@ -2468,7 +2469,6 @@ public class ContractServiceImpl implements ContractService {
//分摊总收入
v
.
setIncomeShareAll
(
intervalIncome
+
v
.
getAdjustmentFund
());
});
return
contracts
;
...
...
@@ -2484,7 +2484,6 @@ public class ContractServiceImpl implements ContractService {
System
.
out
.
println
(
10023L
*
1.0
/
100
);
System
.
out
.
println
((
129
*
100
/
111
)
*
1.0
/
100
);
System
.
out
.
println
();
}
...
...
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