Commit 692a3787 by huluobin

bug fix

parent d62f5567
...@@ -84,38 +84,39 @@ public class CostTemplate implements Serializable { ...@@ -84,38 +84,39 @@ public class CostTemplate implements Serializable {
public boolean shouldDepartmentAutoCheck(CostDomain cost) { public boolean shouldDepartmentAutoCheck(CostDomain cost) {
return enableAutoReview && enableDepartmentReview && !isDefault && return enableAutoReview && enableDepartmentReview && !isDefault
// !cost.getCompanyName().contains("工会") // && !cost.getCompanyName().contains("工会")
; ;
} }
public boolean shouldFinancialAutoCheck(CostDomain cost) { public boolean shouldFinancialAutoCheck(CostDomain cost) {
return enableAutoReview && enableFinancialAutoReview && !isDefault && return enableAutoReview && enableFinancialAutoReview && !isDefault
// !cost.getCompanyName().contains("工会") // && !cost.getCompanyName().contains("工会")
; ;
} }
public boolean shouldFinalAutoCheck(CostDomain cost) { public boolean shouldFinalAutoCheck(CostDomain cost) {
return enableAutoReview && enableFinalReview && !isDefault && return enableAutoReview && enableFinalReview && !isDefault
// !cost.getCompanyName().contains("工会") // && !cost.getCompanyName().contains("工会")
; ;
} }
public boolean shouldFinalCheck(CostDomain cost) { public boolean shouldFinalCheck(CostDomain cost) {
BigDecimal amount = cost.getAmount(); BigDecimal amount = cost.getAmountRmb();
return !(finalMinimumReviewAmount.compareTo(BigDecimal.ZERO) > 0 && return !(finalMinimumReviewAmount.compareTo(BigDecimal.ZERO) > 0 &&
amount.compareTo(finalMinimumReviewAmount) <= 0 && amount.compareTo(finalMinimumReviewAmount) <= 0
// !cost.getCompanyName().contains("工会")) // && !cost.getCompanyName().contains("工会")
)
; ;
} }
public boolean shouldDepartmentCheck(CostDomain cost, BigDecimal departmentMinimumReviewAmount) { public boolean shouldDepartmentCheck(CostDomain cost, BigDecimal departmentMinimumReviewAmount) {
BigDecimal amount = cost.getAmount(); BigDecimal amount = cost.getAmountRmb();
return !(departmentMinimumReviewAmount.compareTo(BigDecimal.ZERO) > 0 && return !(departmentMinimumReviewAmount.compareTo(BigDecimal.ZERO) > 0 &&
amount.compareTo(departmentMinimumReviewAmount) <= 0 && amount.compareTo(departmentMinimumReviewAmount) <= 0
// !cost.getCompanyName().contains("工会") // && !cost.getCompanyName().contains("工会")
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment