diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java index 281d296a..c121d7e5 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java @@ -175,6 +175,24 @@ public class TbsBudgetLog implements Serializable { private String activityTheme; + /** 政策id */ + private Long policyId; + + /** 政策编码 */ + @Length(max = 30,message = "政策编码长度不能超过30字") + private String policyCode; + + /** 政策标题 */ + @Length(max = 255,message = "政策标题长度不能超过255字") + private String policyTitle; + + /** 政策项id */ + private Long policyItemId; + + /** 政策项编码 */ + @Length(max = 30,message = "政策项编码长度不能超过30字") + private String policyItemCode; + /** 费用申请id */ private Long costApplyId; diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java index da6964cc..9de54e29 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java @@ -24,12 +24,19 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper budgetItemApplyAmountMap = new HashMap<>(scheduleItemList.size()); for (TbsScheduleItemBudget itemBudget : scheduleItemList) { BigDecimal budgetItemApplyAmount = tbsScheduleItemBudgetMapper.totalApplyAmount(itemBudget.getId(),costApplyId); - budgetItemApplyAmountMap.put(itemBudget.getId(),budgetItemApplyAmount); - BigDecimal budgetItemAmount = tbsScheduleItemBudgetMapper.totalCostAmount(itemBudget.getBudgetId(),itemBudget.getScheduleItemId(),costApplyId); + if(budgetItemApplyAmount==null){ + budgetItemApplyAmount = BigDecimal.ZERO; + } + BigDecimal budgetItemApplyAmount2 = tbsScheduleItemBudgetMapper.totalPolicyAmount(itemBudget.getId(), costApplyId); + if(budgetItemApplyAmount2!=null){ + budgetItemApplyAmount.add(budgetItemApplyAmount2); + } + budgetItemApplyAmountMap.put(itemBudget.getId(),budgetItemApplyAmount2); + BigDecimal budgetItemAmount = tbsScheduleItemBudgetMapper.totalCostAmountByApplyId(itemBudget.getBudgetId(),itemBudget.getScheduleItemId(),costApplyId); //因为结果为负数,需去相反数 budgetItemAmount = budgetItemAmount==null?BigDecimal.ZERO:budgetItemAmount.negate(); budgetItemAmountMap.put(itemBudget.getId(),budgetItemAmount); diff --git a/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyApplication.java b/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyApplication.java index 33e62fd5..d69ce8d4 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyApplication.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyApplication.java @@ -110,13 +110,16 @@ public class TzcPolicyApplication { //统计费用申请占用金额 Map budgetItemApplyAmountMap = new HashMap<>(scheduleItemList.size()); for (TbsScheduleItemBudget itemBudget : scheduleItemList) { - //TODO 需要重新检查这里 - BigDecimal budgetItemApplyAmount = tbsScheduleItemBudgetMapper.totalApplyAmount(itemBudget.getId(),policyId); - if (budgetItemApplyAmount==null){ + BigDecimal budgetItemApplyAmount = tbsScheduleItemBudgetMapper.totalApplyAmount(itemBudget.getId(),0L); + if(budgetItemApplyAmount==null){ budgetItemApplyAmount = BigDecimal.ZERO; } + BigDecimal budgetItemApplyAmount2 = tbsScheduleItemBudgetMapper.totalPolicyAmount(itemBudget.getId(), policyId); + if(budgetItemApplyAmount2!=null){ + budgetItemApplyAmount.add(budgetItemApplyAmount2); + } budgetItemApplyAmountMap.put(itemBudget.getId(),budgetItemApplyAmount); - BigDecimal budgetItemAmount = tbsScheduleItemBudgetMapper.totalCostAmount(itemBudget.getBudgetId(),itemBudget.getScheduleItemId(),policyId); + BigDecimal budgetItemAmount = tbsScheduleItemBudgetMapper.totalCostAmountByPolicyId(itemBudget.getBudgetId(),itemBudget.getScheduleItemId(),policyId); //因为结果为负数,需去相反数 budgetItemAmount = budgetItemAmount==null?BigDecimal.ZERO:budgetItemAmount.negate(); budgetItemAmountMap.put(itemBudget.getId(),budgetItemAmount);