Browse Source

费用预览,可用预算调整

contract
Yen 2 years ago
parent
commit
5f9e08d045
  1. 14
      src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySlottingFeeController.java
  2. 2
      src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
  3. 7
      src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml

14
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<PageVo<TbsActivitySlottingFee>> getPage2(TbsActivitySlottingFee param){
return R.byEmptyList();
// LambdaQueryWrapper<TbsActivitySlottingFee> lqw = new LambdaQueryWrapper<>();
// PageUtil.startPage();
// List<TbsActivitySlottingFee> list = tbsActivitySlottingFeeService.list(lqw);
// return R.byPageHelperList(list);
}
/**
* ID查询
* @param id

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

7
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
<foreach collection="budgetIds" item ="selectId" index="i" open="(" close=")" separator=",">
@ -88,8 +87,8 @@
#{selectId}
</foreach>
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
</select>

Loading…
Cancel
Save