From a01d8001c5b639a067155cd178c21927f75a31b2 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 8 Jan 2024 14:26:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=8E=87=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BirBudgetScheduleController.java | 16 +- .../bir/controller/BirRoiRateController.java | 6 + .../bir/entity/vo/BirRoiCostItemVo.java | 24 ++- .../serve/modules/bir/entity/vo/BirRoiVo.java | 26 +++ .../bir/service/BirRoiRateService.java | 8 + .../service/impl/BirRoiRateServiceImpl.java | 172 +++++++++++++++++- .../modules/bms/entity/bo/BmsSupplierBo.java | 5 + .../service/GoodsApplicationService.java | 5 + .../oms/controller/api/OmsOrderApi.java | 6 + .../tbs/entity/TbsBudgetCondition.java | 2 + .../service/TbsScheduleItemBudgetService.java | 6 +- .../TbsScheduleItemBudgetServiceImpl.java | 62 ++++--- .../impl/VtbVerificationServiceImpl.java | 3 + .../resources/mapper/tbs/TbsBudget2Mapper.xml | 10 +- 14 files changed, 298 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirBudgetScheduleController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirBudgetScheduleController.java index 0c491e2c..dd38e72c 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirBudgetScheduleController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirBudgetScheduleController.java @@ -37,7 +37,6 @@ public class BirBudgetScheduleController { private final TbsScheduleMapper tbsScheduleMapper; - /** * 查询预算使用情况 * @param query @@ -46,20 +45,7 @@ public class BirBudgetScheduleController { @PostMapping("/budgetUsedList") public R> queryBudgetUsed(@RequestBody TbsScheduleItemSearch query){ query.initCenterCombo(); - if(CollectionUtil.isNotEmpty(query.getScheduleIds())){ - LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.in(TbsScheduleItem::getScheduleId,query.getScheduleIds()); - lqw.select(TbsScheduleItem::getId); - List scheduleItemList = tbsScheduleItemMapper.selectList(lqw); - List itemIds = scheduleItemList.stream().map(a->a.getId().toString()).collect(Collectors.toList()); - query.setScheduleItemIds(itemIds); - } - List scheduleItemBudgetIdDtoList = scheduleItemBudget2Mapper.listItemBudgetIds(query); - List scheduleItemIds = scheduleItemBudgetIdDtoList.stream().map(TbsScheduleItemBudgetIdDto::getScheduleItemId).collect(Collectors.toList()); - if(CollectionUtil.isEmpty(scheduleItemIds)){ - return R.ok(); - } - List scheduleItemWithAmounts = scheduleItemBudgetService.listBudgetAmountByIds(scheduleItemBudgetIdDtoList); + List scheduleItemWithAmounts = scheduleItemBudgetService.listBudgetAmountByIds(query); return R.ok(scheduleItemWithAmounts); } diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java index 5d91f922..68a3ef0a 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java @@ -140,6 +140,12 @@ public class BirRoiRateController { vo.setItemList(itemList); vo.setYtdPercent(birRoiRateService.getYtdPercent(itemList)); vo.setQtdPercent(birRoiRateService.getQtdPercent(itemList)); + + vo.setYtdRegionPercent(birRoiRateService.getYtdRegionPercent(itemList)); + vo.setYtdAllPercent(birRoiRateService.getYtdAllPercent(itemList)); + vo.setQtdAllPercent(birRoiRateService.getQtdAllPercent(itemList)); + vo.setQtdRegionPercent(birRoiRateService.getQtdRegionPercent(itemList)); + return R.ok(vo); } diff --git a/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java b/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java index b6a5823b..9744fa0b 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiCostItemVo.java @@ -21,15 +21,6 @@ public class BirRoiCostItemVo { @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private LocalDate yearMonthDate; -// /** -// * TODO 预算目标 -// */ -// private BigDecimal budgetTargetAmt; -// -// /** -// * TODO 预算统计金额 -// */ -// private BigDecimal budgetTotalAmt; /** * 费用预估金额（目标） @@ -71,6 +62,21 @@ public class BirRoiCostItemVo { */ private BigDecimal regionTotalDispatchAmt; + /** + * 整体发货金额 + */ + private BigDecimal allDispatchAmt; + + /** + * 整体费用金额 + */ + private BigDecimal allCostAmt; + + /** + * 整体ORI达成率 + */ + private BigDecimal allRoiRate; + private Float ytdPercent; private Float qtdPercent; diff --git a/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiVo.java b/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiVo.java index fce71d0b..68744649 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiVo.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiVo.java @@ -16,7 +16,33 @@ public class BirRoiVo { private List itemList; + /** + * 当年费用率 + */ private Float ytdPercent; + /** + * 当年大区费用率 + */ + private Float ytdRegionPercent; + + /** + * 当年整体费用率 + */ + private Float ytdAllPercent; + + /** + * 当季费用率 + */ private Float qtdPercent; + + /** + * 当季整体费用率 + */ + private Float qtdAllPercent; + + /** + * 当季大区费用率 + */ + private Float qtdRegionPercent; } diff --git a/src/main/java/com/qs/serve/modules/bir/service/BirRoiRateService.java b/src/main/java/com/qs/serve/modules/bir/service/BirRoiRateService.java index e8d967a4..29a424f9 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/BirRoiRateService.java +++ b/src/main/java/com/qs/serve/modules/bir/service/BirRoiRateService.java @@ -34,8 +34,16 @@ public interface BirRoiRateService extends IService { Float getYtdPercent(List list); + Float getYtdAllPercent(List list); + + Float getYtdRegionPercent(List list); + Float getQtdPercent(List list); + Float getQtdAllPercent(List list); + + Float getQtdRegionPercent(List list); + YtdQtdToOAVo buildYtdAndQtdData(TbsCostApply apply); /** diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java index 468030c6..2a885973 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java @@ -121,16 +121,49 @@ public class BirRoiRateServiceImpl extends ServiceImpl costItemVoList = this.queryRoiCostItems(costDTO); + //整体费率，不添加过滤条件 + BirRoiCostDTO costDTO2 = new BirRoiCostDTO(); + costDTO2.setStartMonthNum(startMonthNum); + costDTO2.setEndMonthNum(currMonthNum); + List DataCountAllList = baseMapper.queryRoiCostItems(costDTO2); + for (BirRoiCostItemVo data1 : DataCountAllList) { + for (BirRoiCostItemVo data2 : costItemVoList) { + if(data1.getYearMonth().equals(data2.getYearMonth())){ + data2.setAllCostAmt(data1.getCostAmt()); + break; + } + } + } + //构建大区费率 this.buildRegionCostAndRate(supplier, currMonthNum, startMonthNum, supplierCodeList, costItemVoList); - //发货单 + //客户发货单 List dispatchSumVos = null; if(supplierCodeList!=null&&supplierCodeList.size()>0){ dispatchSumVos = dispatchDataMapper.querySumCost(startMonthNum,currMonthNum,supplierCodeList); } + //整体发货单 + List allDispatch = dispatchDataMapper.querySumCost(startMonthNum,currMonthNum,null); + for (BirRoiCostItemVo costItemVo : costItemVoList) { costItemVo.setDispatchAmt(BigDecimal.ZERO); + costItemVo.setAllDispatchAmt(BigDecimal.ZERO); + //关联 整体发货单 + for (ErpDispatchSumVo dispatch : allDispatch) { + if(dispatch.getYearMonth().equals(costItemVo.getYearMonth())){ + // 发货金额=原发货金额) + costItemVo.setAllDispatchAmt(dispatch.getDispatchSumCost()); + //设置整体维度ROI + if (costItemVo.getAllCostAmt()!=null + &&costItemVo.getAllDispatchAmt()!=null + &&costItemVo.getAllDispatchAmt().compareTo(BigDecimal.ZERO)!=0){ + costItemVo.setAllRoiRate(costItemVo.getAllCostAmt().divide(costItemVo.getAllDispatchAmt(),2,RoundingMode.DOWN)); + } + break; + } + } + //关联 客户发货单 if(dispatchSumVos!=null){ for (ErpDispatchSumVo dispatchSumVo : dispatchSumVos) { if(dispatchSumVo.getYearMonth().equals(costItemVo.getYearMonth())){ @@ -141,6 +174,8 @@ public class BirRoiRateServiceImpl extends ServiceImpl costItemVos = new ArrayList<>(); for (int i = startMonthNum; i <= currMonthNum; i++) { @@ -269,6 +304,66 @@ public class BirRoiRateServiceImpl extends ServiceImpl list) { + Float ytdPercent = null; + + LocalDate currMonth = LocalDate.now(); + if(currMonth.getMonthValue()==1){ + return ytdPercent; + } + + BigDecimal costAmt = BigDecimal.ZERO; + BigDecimal dispatchAmt = BigDecimal.ZERO; + + currMonth = currMonth.plusMonths(-1); + int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue(); + int startMonthNum = currMonth.getYear()*100 + 1; + + for(BirRoiCostItemVo vo:list){ + if(vo.getYearMonth()<=currMonthNum && vo.getYearMonth()>=startMonthNum){ + costAmt = costAmt.add(vo.getAllCostAmt()); + dispatchAmt = dispatchAmt.add(vo.getAllDispatchAmt()); + } + } + + if(dispatchAmt.compareTo(BigDecimal.ZERO)>0) { + ytdPercent = costAmt.divide(dispatchAmt,4, RoundingMode.HALF_UP).floatValue(); + } + + return ytdPercent; + } + + @Override + public Float getYtdRegionPercent(List list) { + Float ytdPercent = null; + + LocalDate currMonth = LocalDate.now(); + if(currMonth.getMonthValue()==1){ + return ytdPercent; + } + + BigDecimal costAmt = BigDecimal.ZERO; + BigDecimal dispatchAmt = BigDecimal.ZERO; + + currMonth = currMonth.plusMonths(-1); + int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue(); + int startMonthNum = currMonth.getYear()*100 + 1; + + for(BirRoiCostItemVo vo:list){ + if(vo.getYearMonth()<=currMonthNum && vo.getYearMonth()>=startMonthNum){ + costAmt = costAmt.add(vo.getRegionTotalCostAmt()); + dispatchAmt = dispatchAmt.add(vo.getRegionTotalDispatchAmt()); + } + } + + if(dispatchAmt.compareTo(BigDecimal.ZERO)>0) { + ytdPercent = costAmt.divide(dispatchAmt,4, RoundingMode.HALF_UP).floatValue(); + } + + return ytdPercent; + } + @Override public Float getQtdPercent(List list){ Float qtdPercent = null; @@ -307,6 +402,81 @@ public class BirRoiRateServiceImpl extends ServiceImpl list) { + Float qtdPercent = null; + + LocalDate currMonth = LocalDate.now(); + if(currMonth.getMonthValue()==1){ + return 0F; + } + // 获取当前季度的第一个月 + Month firstMonthOfQuarter = currMonth.getMonth().firstMonthOfQuarter(); + // 获取当季第一个月的整数表示 + int firstMonthInteger = firstMonthOfQuarter.getValue(); + + if(firstMonthInteger == currMonth.getMonthValue()){ + return 0F; + } + + currMonth = currMonth.plusMonths(-1); + int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue(); + int startMonthNum = currMonth.getYear()*100 + firstMonthInteger; + + BigDecimal costAmt = BigDecimal.ZERO; + BigDecimal dispatchAmt = BigDecimal.ZERO; + + for(BirRoiCostItemVo vo:list){ + if(vo.getYearMonth()<=currMonthNum && vo.getYearMonth()>=startMonthNum){ + costAmt = costAmt.add(vo.getAllCostAmt()); + dispatchAmt = dispatchAmt.add(vo.getAllDispatchAmt()); + } + } + + if(dispatchAmt.compareTo(BigDecimal.ZERO)>0) { + qtdPercent = costAmt.divide(dispatchAmt,4, RoundingMode.HALF_UP).floatValue(); + } + + return qtdPercent; + } + + @Override + public Float getQtdRegionPercent(List list) { + Float qtdPercent = null; + + LocalDate currMonth = LocalDate.now(); + if(currMonth.getMonthValue()==1){ + return 0F; + } + // 获取当前季度的第一个月 + Month firstMonthOfQuarter = currMonth.getMonth().firstMonthOfQuarter(); + // 获取当季第一个月的整数表示 + int firstMonthInteger = firstMonthOfQuarter.getValue(); + + if(firstMonthInteger == currMonth.getMonthValue()){ + return 0F; + } + + currMonth = currMonth.plusMonths(-1); + int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue(); + int startMonthNum = currMonth.getYear()*100 + firstMonthInteger; + + BigDecimal costAmt = BigDecimal.ZERO; + BigDecimal dispatchAmt = BigDecimal.ZERO; + + for(BirRoiCostItemVo vo:list){ + if(vo.getYearMonth()<=currMonthNum && vo.getYearMonth()>=startMonthNum){ + costAmt = costAmt.add(vo.getRegionTotalCostAmt()); + dispatchAmt = dispatchAmt.add(vo.getRegionTotalDispatchAmt()); + } + } + + if(dispatchAmt.compareTo(BigDecimal.ZERO)>0) { + qtdPercent = costAmt.divide(dispatchAmt,4, RoundingMode.HALF_UP).floatValue(); + } + + return qtdPercent; + } @Override public YtdQtdToOAVo buildYtdAndQtdData(TbsCostApply apply){ diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java index 7fce1649..293fd022 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java @@ -96,4 +96,9 @@ public class BmsSupplierBo { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime cooperatePauseFlagDate; + + private String comRegion; + + private String comRegionCode; + } diff --git a/src/main/java/com/qs/serve/modules/goods/service/GoodsApplicationService.java b/src/main/java/com/qs/serve/modules/goods/service/GoodsApplicationService.java index 3c9f25ac..814a029c 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/GoodsApplicationService.java +++ b/src/main/java/com/qs/serve/modules/goods/service/GoodsApplicationService.java @@ -98,6 +98,11 @@ public class GoodsApplicationService { //更新sku for (StandInventory inventory : inventoryList) { + //过滤错误的sku + if(!inventory.getInvCode().startsWith("3")){ + continue; + } + //空值 默认开平 if(inventory.getInvPlace()==null){ inventory.setInvPlace("开平"); diff --git a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java index 9dfc0541..6af1be4a 100644 --- a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java +++ b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java @@ -163,6 +163,12 @@ public class OmsOrderApi { if(sysUser!=null){ order.setCheckUserInfo(sysUser.toSysUserVo()); } + + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(OmsOrderItem::getOrderId,order.getId()); + List items = omsOrderItemService.list(lqw); + order.setOrderItems(items); + } return R.byPageHelperList(list); } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCondition.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCondition.java index 89a01b16..48b8626a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCondition.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCondition.java @@ -85,6 +85,8 @@ public class TbsBudgetCondition implements Serializable { @JsonProperty private String tenantId; + private String brandId; + /** 创建人 */ @TableField(fill = FieldFill.INSERT) private String createBy; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsScheduleItemBudgetService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsScheduleItemBudgetService.java index 27b4e8d3..fff556e1 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsScheduleItemBudgetService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsScheduleItemBudgetService.java @@ -7,6 +7,7 @@ import com.qs.serve.modules.tbs.entity.dto.TbsBudgetScheduleWithAmount; import com.qs.serve.modules.tbs.entity.dto.TbsScheduleItemBudgetIdDto; import com.qs.serve.modules.tbs.entity.dto.TbsScheduleItemWithAmount; import com.qs.serve.modules.tbs.entity.dto.TbsBudgetWithAmount; +import com.qs.serve.modules.tbs.entity.so.TbsScheduleItemSearch; import java.time.LocalDate; import java.util.List; @@ -37,12 +38,13 @@ public interface TbsScheduleItemBudgetService extends IService listScheduleItemAmountByIds(List budgetIdDtoList); + /** * 预算维度统计 - * @param budgetIdDtoList + * @param param * @return */ - List listBudgetAmountByIds(List budgetIdDtoList); + List listBudgetAmountByIds(TbsScheduleItemSearch param); } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java index 570e4e34..4a3f20bf 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java @@ -3,17 +3,17 @@ package com.qs.serve.modules.tbs.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.common.model.enums.BudgetLogOptFlag; +import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.modules.tbs.entity.TbsBudget; +import com.qs.serve.modules.tbs.entity.TbsBudgetCondition; import com.qs.serve.modules.tbs.entity.dto.*; -import com.qs.serve.modules.tbs.mapper.TbsBudgetLog2Mapper; -import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper; -import com.qs.serve.modules.tbs.mapper.TbsScheduleItemBudget2Mapper; +import com.qs.serve.modules.tbs.entity.so.TbsScheduleItemSearch; +import com.qs.serve.modules.tbs.mapper.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget; import com.qs.serve.modules.tbs.service.TbsScheduleItemBudgetService; -import com.qs.serve.modules.tbs.mapper.TbsScheduleItemBudgetMapper; import java.time.LocalDate; import java.util.ArrayList; @@ -35,6 +35,7 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl betweenDateList(LocalDate startDate, LocalDate endDate) { @@ -210,34 +211,52 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl listBudgetAmountByIds(List budgetIdDtoList) { - - List scheduleItemBudgetIds = budgetIdDtoList.stream().map(TbsScheduleItemBudgetIdDto::getScheduleItemBudgetId).collect(Collectors.toList()); - - //加载 - LambdaQueryWrapper sibLqw = new LambdaQueryWrapper<>(); - sibLqw.in(TbsScheduleItemBudget::getId,scheduleItemBudgetIds); - sibLqw.select(TbsScheduleItemBudget::getBudgetId); - List tbsScheduleItemBudgetList = this.list(sibLqw); - List budgetIds = tbsScheduleItemBudgetList.stream().map(TbsScheduleItemBudget::getBudgetId).distinct().collect(Collectors.toList()); - - List budgetList = tbsBudgetMapper.selectBatchIds(budgetIds); + public List listBudgetAmountByIds(TbsScheduleItemSearch param) { + LambdaQueryWrapper budgetLqw = new LambdaQueryWrapper<>(); + budgetLqw.in(TbsBudget::getScheduleId,param.getScheduleIds()); + budgetLqw.in(TbsBudget::getCenterCombo,param.getCenterCombos()); + budgetLqw.eq(TbsBudget::getBudgetState,1); + List budgetList = tbsBudgetMapper.selectList(budgetLqw); + + List budgetIds; + + if(CollectionUtil.isNotEmpty(param.getBrandIds())){ + //无品牌条件 + budgetIds = budgetList.stream() + .filter(a->a.getConditionFlag().equals(0)) + .map(TbsBudget::getId).collect(Collectors.toList()); + + //筛选符合品牌条件 + List conBudgetIds = budgetList.stream() + .filter(a->a.getConditionFlag().equals(1)) + .map(TbsBudget::getId).collect(Collectors.toList()); + + LambdaQueryWrapper conLqw = new LambdaQueryWrapper<>(); + conLqw.in(TbsBudgetCondition::getBudgetId,conBudgetIds); + conLqw.in(TbsBudgetCondition::getBrandId,param.getBrandIds()); + List conditions = budgetConditionMapper.selectList(conLqw); + conBudgetIds = conditions.stream().map(TbsBudgetCondition::getBudgetId).collect(Collectors.toList()); + budgetIds.addAll(conBudgetIds); + }else { + //加载所有 + budgetIds = budgetList.stream().map(TbsBudget::getId).collect(Collectors.toList()); + } // 预算金额 List finalList = tbsBudgetLog2Mapper.getSumFinalAmtInList(budgetIds, BudgetLogOptFlag.getFinalBudgetOptFlag()); // 被占用金额 - List usedList = tbsBudgetLog2Mapper.getSumAmtNotInList(scheduleItemBudgetIds, BudgetLogOptFlag.getFinalBudgetOptFlag()); + List usedList = tbsBudgetLog2Mapper.getSumAmtNotInList(budgetIds, BudgetLogOptFlag.getFinalBudgetOptFlag()); // 费用使用金额 - List costUsedList = tbsBudgetLog2Mapper.getSumAmtInList(scheduleItemBudgetIds, BudgetLogOptFlag.finalCostOptFlag); + List costUsedList = tbsBudgetLog2Mapper.getSumAmtInList(budgetIds, BudgetLogOptFlag.finalCostOptFlag); // 政策使用金额 - List policyUsedList = tbsBudgetLog2Mapper.getSumAmtInList(scheduleItemBudgetIds, BudgetLogOptFlag.finalPolicyOptFlag); + List policyUsedList = tbsBudgetLog2Mapper.getSumAmtInList(budgetIds, BudgetLogOptFlag.finalPolicyOptFlag); - List policyCheckingList = tbsBudgetLog2Mapper.getPolicyCheckingList(scheduleItemBudgetIds, BudgetLogOptFlag.finalPolicyOptFlag); + List policyCheckingList = tbsBudgetLog2Mapper.getPolicyCheckingList(budgetIds, BudgetLogOptFlag.finalPolicyOptFlag); - List costCheckingList = tbsBudgetLog2Mapper.getCostCheckingList(scheduleItemBudgetIds, BudgetLogOptFlag.finalCostOptFlag); + List costCheckingList = tbsBudgetLog2Mapper.getCostCheckingList(budgetIds, BudgetLogOptFlag.finalCostOptFlag); List result = new ArrayList<>(); @@ -312,5 +331,6 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl #{selectId} @@ -64,7 +64,7 @@ #{selectId} - AND schedule_item_budget_id in + AND budget_id in #{selectId} @@ -81,7 +81,7 @@ #{selectId} - AND schedule_item_budget_id in + AND budget_id in #{selectId} @@ -103,7 +103,7 @@ #{selectId} - AND schedule_item_budget_id in + AND tbs_budget_log.budget_id in #{selectId} @@ -125,7 +125,7 @@ #{selectId} - AND schedule_item_budget_id in + AND tbs_budget_log.budget_id in #{selectId}