Commit d62f5567 by huluobin

bug fix

parent 9176c024
......@@ -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) {
......
......@@ -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);
......
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