Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-cost-system
Overview
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
bltdc
dc-cost-system
Commits
d62f5567
Commit
d62f5567
authored
Nov 24, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
9176c024
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
CostTemplate.java
...in/java/com/blt/other/module/cost/model/CostTemplate.java
+8
-4
CostPlanNewLend2ServiceImpl.java
...st/service/impl/costplan/CostPlanNewLend2ServiceImpl.java
+0
-4
No files found.
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/model/CostTemplate.java
View file @
d62f5567
...
...
@@ -85,17 +85,20 @@ public class CostTemplate implements Serializable {
public
boolean
shouldDepartmentAutoCheck
(
CostDomain
cost
)
{
return
enableAutoReview
&&
enableDepartmentReview
&&
!
isDefault
&&
!
cost
.
getCompanyName
().
contains
(
"工会"
);
// !cost.getCompanyName().contains("工会")
;
}
public
boolean
shouldFinancialAutoCheck
(
CostDomain
cost
)
{
return
enableAutoReview
&&
enableFinancialAutoReview
&&
!
isDefault
&&
!
cost
.
getCompanyName
().
contains
(
"工会"
);
// !cost.getCompanyName().contains("工会")
;
}
public
boolean
shouldFinalAutoCheck
(
CostDomain
cost
)
{
return
enableAutoReview
&&
enableFinalReview
&&
!
isDefault
&&
!
cost
.
getCompanyName
().
contains
(
"工会"
);
// !cost.getCompanyName().contains("工会")
;
}
public
boolean
shouldFinalCheck
(
CostDomain
cost
)
{
...
...
@@ -103,7 +106,8 @@ public class CostTemplate implements Serializable {
return
!(
finalMinimumReviewAmount
.
compareTo
(
BigDecimal
.
ZERO
)
>
0
&&
amount
.
compareTo
(
finalMinimumReviewAmount
)
<=
0
&&
!
cost
.
getCompanyName
().
contains
(
"工会"
));
// !cost.getCompanyName().contains("工会"))
;
}
public
boolean
shouldDepartmentCheck
(
CostDomain
cost
,
BigDecimal
departmentMinimumReviewAmount
)
{
...
...
bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costplan/CostPlanNewLend2ServiceImpl.java
View file @
d62f5567
...
...
@@ -130,15 +130,11 @@ public class CostPlanNewLend2ServiceImpl extends AbstractCostPlanService impleme
costDomain
.
setCostStatus
(
0
);
costDomain
.
setAmount
(
subtract
);
costDomain
.
setCounteract
(
subtract
);
//计算支付币种的金额
costDomain
.
setPayPlanAmount
(
subtract
.
divide
(
costPlanDomain
.
getPayCur
(),
4
));
costDomain
.
setPayCounteract
(
subtract
.
divide
(
costPlanDomain
.
getPayCur
(),
4
));
BigDecimal
toRmbRate
=
CurUtils
.
getCur
(
costDomain
.
getDic
(),
"CNY"
);
costDomain
.
setToRmbRate
(
toRmbRate
);
costDomain
.
setAmountRmb
(
costDomain
.
getAmount
().
multiply
(
toRmbRate
).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
));
costDao
.
insert
(
costDomain
);
...
...
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