Browse Source

修改费用申请参数名

contract
Yen 2 years ago
parent
commit
8813181c47
  1. 7
      src/main/java/com/qs/serve/modules/tbs/entity/TbsScheduleItemBudget.java
  2. 14
      src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java
  3. 4
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

7
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;
}
}

14
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;
}
}

4
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@ -296,7 +296,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
for(TbsScheduleItemBudget tbsScheduleItemBudget : tbsScheduleItemBudgets){
subList.add(
new TbsCostSubItem.Amount(
tbsScheduleItemBudget.getBudgetAmount(),tbsScheduleItemBudget.getPreDispatchAmount()
tbsScheduleItemBudget.getBudgetAmount(),
tbsScheduleItemBudget.getPreDispatchAmount(),
tbsScheduleItemBudget.compareTargetExpenseRate()
)
);
}

Loading…
Cancel
Save