diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySlottingFeeController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySlottingFeeController.java index 52abc524..5c5240f7 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySlottingFeeController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySlottingFeeController.java @@ -59,6 +59,20 @@ public class TbsActivitySlottingFeeController { return R.byPageHelperList(list); } + /** + * TODO 翻页 + * @param param + * @return + */ + @GetMapping("/page2") + public R> getPage2(TbsActivitySlottingFee param){ + return R.byEmptyList(); +// LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); +// PageUtil.startPage(); +// List list = tbsActivitySlottingFeeService.list(lqw); +// return R.byPageHelperList(list); + } + /** * ID查询 * @param id diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index 307d0856..14f4065f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -258,8 +258,8 @@ public class TbsBudgetApplicationService { for (TbsBudgetLogPreAmount logPreAmount : budgetLogPreAmounts) { if(itemBudget.getBudgetId().equals(logPreAmount.getBudgetId())&&itemBudget.getScheduleItemId().equals(logPreAmount.getScheduleItemId())){ BigDecimal budgetItemAmount = logPreAmount.getAmount(); - //因为结果为负数,需去相反数 isNotMatch = false; + //因为已使用的预算费用为负数,需去相反数 budgetItemAmount = budgetItemAmount==null?BigDecimal.ZERO:budgetItemAmount.negate(); budgetItemAmountMap.put(itemBudget.getId(),budgetItemAmount); } diff --git a/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml b/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml index 3f7a570f..6ac2303a 100644 --- a/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml +++ b/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml @@ -71,13 +71,12 @@ SELECT `tbs_budget_log`.budget_id, `tbs_budget_log`.schedule_item_id, - `tbs_budget_log`.amount + sum (`tbs_budget_log`.amount) amount FROM `tbs_budget_log` LEFT JOIN `tbs_cost_apply` ON `tbs_budget_log` .cost_apply_id = tbs_cost_apply.id - AND `tbs_budget_log`.rollback_flag = '0' WHERE `tbs_budget_log`.budget_id in @@ -88,8 +87,8 @@ #{selectId} AND `tbs_cost_apply`.id != #{applyId} - AND `tbs_cost_apply`.charge_state in (1,2,3) - AND opt_type IN (1,4,5,6) + AND opt_type IN (1,4,5,6,15) + group by `tbs_budget_log`.budget_id,`tbs_budget_log`.schedule_item_id