diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsScheduleItemBudget.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsScheduleItemBudget.java index ee6a1879..f5aaaeb2 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsScheduleItemBudget.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsScheduleItemBudget.java @@ -103,5 +103,12 @@ public class TbsScheduleItemBudget implements Serializable { private String delFlag; + public BigDecimal compareTargetExpenseRate(){ + if(budgetAmount!=null&&preDispatchAmount!=null&&preDispatchAmount.compareTo(BigDecimal.ZERO)!=0){ + return budgetAmount.divide(preDispatchAmount,BigDecimal.ROUND_DOWN); + } + return null; + } + } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java index 52f73f7e..46d04f58 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java @@ -27,8 +27,18 @@ public class TbsCostSubItem { @Data @AllArgsConstructor public static class Amount{ - private BigDecimal budgetAmount; - private BigDecimal preDispatchAmout; + + //budgetAmount + private BigDecimal areaBudget; + + //preDispatchAmout + private BigDecimal targetSales; + + //targetExpenseRate = areaBudget/targetSales + private BigDecimal targetExpenseRate; + + + } } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 0ade6d7c..b27b51aa 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -296,7 +296,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl