费率调整

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<List<TbsBudgetWithAmount>> queryBudgetUsed(@RequestBody TbsScheduleItemSearch query){
         query.initCenterCombo();
-        if(CollectionUtil.isNotEmpty(query.getScheduleIds())){
-            LambdaQueryWrapper<TbsScheduleItem> lqw = new LambdaQueryWrapper<>();
-            lqw.in(TbsScheduleItem::getScheduleId,query.getScheduleIds());
-            lqw.select(TbsScheduleItem::getId);
-            List<TbsScheduleItem> scheduleItemList = tbsScheduleItemMapper.selectList(lqw);
-            List<String> itemIds = scheduleItemList.stream().map(a->a.getId().toString()).collect(Collectors.toList());
-            query.setScheduleItemIds(itemIds);
-        }
-        List<TbsScheduleItemBudgetIdDto> scheduleItemBudgetIdDtoList = scheduleItemBudget2Mapper.listItemBudgetIds(query);
-        List<Long> scheduleItemIds = scheduleItemBudgetIdDtoList.stream().map(TbsScheduleItemBudgetIdDto::getScheduleItemId).collect(Collectors.toList());
-        if(CollectionUtil.isEmpty(scheduleItemIds)){
-            return R.ok();
-        }
-        List<TbsBudgetWithAmount> scheduleItemWithAmounts = scheduleItemBudgetService.listBudgetAmountByIds(scheduleItemBudgetIdDtoList);
+        List<TbsBudgetWithAmount> scheduleItemWithAmounts = scheduleItemBudgetService.listBudgetAmountByIds(query);
         return R.ok(scheduleItemWithAmounts);
     }
 

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

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;

src/main/java/com/qs/serve/modules/bir/entity/vo/BirRoiVo.java

@@ -16,7 +16,33 @@ public class BirRoiVo {
 
     private List<BirRoiCostItemVo> itemList;
 
+    /**
+     * 当年费用率
+     */
     private Float ytdPercent;
 
+    /**
+     * 当年大区费用率
+     */
+    private Float ytdRegionPercent;
+
+    /**
+     * 当年整体费用率
+     */
+    private Float ytdAllPercent;
+
+    /**
+     * 当季费用率
+     */
     private Float qtdPercent;
+
+    /**
+     * 当季整体费用率
+     */
+    private Float qtdAllPercent;
+
+    /**
+     * 当季大区费用率
+     */
+    private Float qtdRegionPercent;
 }

src/main/java/com/qs/serve/modules/bir/service/BirRoiRateService.java

@@ -34,8 +34,16 @@ public interface BirRoiRateService extends IService<BirRoiRate> {
 
     Float getYtdPercent(List<BirRoiCostItemVo> list);
 
+    Float getYtdAllPercent(List<BirRoiCostItemVo> list);
+
+    Float getYtdRegionPercent(List<BirRoiCostItemVo> list);
+
     Float getQtdPercent(List<BirRoiCostItemVo> list);
 
+    Float getQtdAllPercent(List<BirRoiCostItemVo> list);
+
+    Float getQtdRegionPercent(List<BirRoiCostItemVo> list);
+
     YtdQtdToOAVo buildYtdAndQtdData(TbsCostApply apply);
 
     /**

src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java

@@ -121,16 +121,49 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
 
         List<BirRoiCostItemVo> costItemVoList = this.queryRoiCostItems(costDTO);
 
+        //整体费率，不添加过滤条件
+        BirRoiCostDTO costDTO2 = new BirRoiCostDTO();
+        costDTO2.setStartMonthNum(startMonthNum);
+        costDTO2.setEndMonthNum(currMonthNum);
+        List<BirRoiCostItemVo> 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<ErpDispatchSumVo> dispatchSumVos = null;
         if(supplierCodeList!=null&&supplierCodeList.size()>0){
             dispatchSumVos = dispatchDataMapper.querySumCost(startMonthNum,currMonthNum,supplierCodeList);
         }
+        //整体发货单
+        List<ErpDispatchSumVo> 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<BirRoiRateMapper,BirRoiRa
                 }
             }
         }
+
+
         //补充数据0的项
         List<BirRoiCostItemVo> costItemVos = new ArrayList<>();
         for (int i = startMonthNum; i <= currMonthNum; i++) {
@@ -269,6 +304,66 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
         return ytdPercent;
     }
 
+    @Override
+    public Float getYtdAllPercent(List<BirRoiCostItemVo> 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<BirRoiCostItemVo> 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<BirRoiCostItemVo> list){
         Float qtdPercent = null;
@@ -307,6 +402,81 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
         return qtdPercent;
     }
 
+    @Override
+    public Float getQtdAllPercent(List<BirRoiCostItemVo> 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<BirRoiCostItemVo> 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){

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

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("开平");

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<OmsOrderItem> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(OmsOrderItem::getOrderId,order.getId());
+            List<OmsOrderItem> items = omsOrderItemService.list(lqw);
+            order.setOrderItems(items);
+
         }
         return R.byPageHelperList(list);
     }

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;

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<TbsScheduleItemBu
      */
     List<TbsScheduleItemWithAmount> listScheduleItemAmountByIds(List<TbsScheduleItemBudgetIdDto> budgetIdDtoList);
 
+
     /**
      * 预算维度统计
-     * @param budgetIdDtoList
+     * @param param
      * @return
      */
-    List<TbsBudgetWithAmount> listBudgetAmountByIds(List<TbsScheduleItemBudgetIdDto> budgetIdDtoList);
+    List<TbsBudgetWithAmount> listBudgetAmountByIds(TbsScheduleItemSearch param);
 
 }
 

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<TbsScheduleIte
     private final TbsBudgetMapper tbsBudgetMapper;
     private final TbsScheduleItemBudget2Mapper scheduleItemBudget2Mapper;
     private final TbsBudgetLog2Mapper tbsBudgetLog2Mapper;
+    private final TbsBudgetConditionMapper budgetConditionMapper;
 
     @Override
     public List<TbsScheduleItemBudget> betweenDateList(LocalDate startDate, LocalDate endDate) {
@@ -210,34 +211,52 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl<TbsScheduleIte
     }
 
     @Override
-    public List<TbsBudgetWithAmount> listBudgetAmountByIds(List<TbsScheduleItemBudgetIdDto> budgetIdDtoList) {
-
-        List<Long> scheduleItemBudgetIds = budgetIdDtoList.stream().map(TbsScheduleItemBudgetIdDto::getScheduleItemBudgetId).collect(Collectors.toList());
-
-        //加载
-        LambdaQueryWrapper<TbsScheduleItemBudget> sibLqw = new LambdaQueryWrapper<>();
-        sibLqw.in(TbsScheduleItemBudget::getId,scheduleItemBudgetIds);
-        sibLqw.select(TbsScheduleItemBudget::getBudgetId);
-        List<TbsScheduleItemBudget> tbsScheduleItemBudgetList = this.list(sibLqw);
-        List<Long> budgetIds = tbsScheduleItemBudgetList.stream().map(TbsScheduleItemBudget::getBudgetId).distinct().collect(Collectors.toList());
-
-        List<TbsBudget> budgetList = tbsBudgetMapper.selectBatchIds(budgetIds);
+    public List<TbsBudgetWithAmount> listBudgetAmountByIds(TbsScheduleItemSearch param) {
+        LambdaQueryWrapper<TbsBudget> budgetLqw = new LambdaQueryWrapper<>();
+        budgetLqw.in(TbsBudget::getScheduleId,param.getScheduleIds());
+        budgetLqw.in(TbsBudget::getCenterCombo,param.getCenterCombos());
+        budgetLqw.eq(TbsBudget::getBudgetState,1);
+        List<TbsBudget> budgetList = tbsBudgetMapper.selectList(budgetLqw);
+
+        List<Long> budgetIds;
+
+        if(CollectionUtil.isNotEmpty(param.getBrandIds())){
+            //无品牌条件
+            budgetIds = budgetList.stream()
+                    .filter(a->a.getConditionFlag().equals(0))
+                    .map(TbsBudget::getId).collect(Collectors.toList());
+
+            //筛选符合品牌条件
+            List<Long> conBudgetIds = budgetList.stream()
+                    .filter(a->a.getConditionFlag().equals(1))
+                    .map(TbsBudget::getId).collect(Collectors.toList());
+
+            LambdaQueryWrapper<TbsBudgetCondition> conLqw = new LambdaQueryWrapper<>();
+            conLqw.in(TbsBudgetCondition::getBudgetId,conBudgetIds);
+            conLqw.in(TbsBudgetCondition::getBrandId,param.getBrandIds());
+            List<TbsBudgetCondition> 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<TbsBudgetLogWithAmount> finalList = tbsBudgetLog2Mapper.getSumFinalAmtInList(budgetIds, BudgetLogOptFlag.getFinalBudgetOptFlag());
 
         // 被占用金额
-        List<TbsBudgetLogWithAmount> usedList = tbsBudgetLog2Mapper.getSumAmtNotInList(scheduleItemBudgetIds, BudgetLogOptFlag.getFinalBudgetOptFlag());
+        List<TbsBudgetLogWithAmount> usedList = tbsBudgetLog2Mapper.getSumAmtNotInList(budgetIds, BudgetLogOptFlag.getFinalBudgetOptFlag());
 
         // 费用使用金额
-        List<TbsBudgetLogWithAmount> costUsedList = tbsBudgetLog2Mapper.getSumAmtInList(scheduleItemBudgetIds, BudgetLogOptFlag.finalCostOptFlag);
+        List<TbsBudgetLogWithAmount> costUsedList = tbsBudgetLog2Mapper.getSumAmtInList(budgetIds, BudgetLogOptFlag.finalCostOptFlag);
 
         // 政策使用金额
-        List<TbsBudgetLogWithAmount> policyUsedList = tbsBudgetLog2Mapper.getSumAmtInList(scheduleItemBudgetIds, BudgetLogOptFlag.finalPolicyOptFlag);
+        List<TbsBudgetLogWithAmount> policyUsedList = tbsBudgetLog2Mapper.getSumAmtInList(budgetIds, BudgetLogOptFlag.finalPolicyOptFlag);
 
-        List<TbsBudgetLogWithAmount> policyCheckingList = tbsBudgetLog2Mapper.getPolicyCheckingList(scheduleItemBudgetIds, BudgetLogOptFlag.finalPolicyOptFlag);
+        List<TbsBudgetLogWithAmount> policyCheckingList = tbsBudgetLog2Mapper.getPolicyCheckingList(budgetIds, BudgetLogOptFlag.finalPolicyOptFlag);
 
-        List<TbsBudgetLogWithAmount> costCheckingList = tbsBudgetLog2Mapper.getCostCheckingList(scheduleItemBudgetIds, BudgetLogOptFlag.finalCostOptFlag);
+        List<TbsBudgetLogWithAmount> costCheckingList = tbsBudgetLog2Mapper.getCostCheckingList(budgetIds, BudgetLogOptFlag.finalCostOptFlag);
 
         List<TbsBudgetWithAmount> result = new ArrayList<>();
 
@@ -312,5 +331,6 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl<TbsScheduleIte
 
         return result;
     }
+
 }
 

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -697,6 +697,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         verification.setActivityId(verificationBo.getActivityId());
         verification.setAttachIds(verificationBo.getAttachIds());
         verification.setInputReleaseFlag(verificationBo.getInputReleaseFlag());
+        if(verificationBo.getInputReleaseFlag().equals(0)){
+            verification.setRegReleaseFlag(1);
+        }
         verification.setSupplierId(activity.getSupplierId());
         verification.setSupplierCode(activity.getSupplierCode());
         verification.setSupplierName(activity.getSupplierName());

src/main/resources/mapper/tbs/TbsBudget2Mapper.xml

@@ -43,7 +43,7 @@
         sum(amount) as amt
         from tbs_budget_log
         where
-        del_flag = 0 and  opt_type not in
+        del_flag = 0 and  opt_type in
         <foreach collection="optNumbers" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
@@ -64,7 +64,7 @@
         <foreach collection="optNumbers" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
-        AND schedule_item_budget_id in
+        AND budget_id in
         <foreach collection="selectIds" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
@@ -81,7 +81,7 @@
         <foreach collection="optNumbers" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
-        AND schedule_item_budget_id in
+        AND budget_id in
         <foreach collection="selectIds" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
@@ -103,7 +103,7 @@
         <foreach collection="optNumbers" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
-        AND schedule_item_budget_id in
+        AND tbs_budget_log.budget_id in
         <foreach collection="selectIds" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
@@ -125,7 +125,7 @@
         <foreach collection="optNumbers" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
-        AND schedule_item_budget_id in
+        AND tbs_budget_log.budget_id in
         <foreach collection="selectIds" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>