feat：增加修复品类预算脚本

refactor: 预算查询重构

src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java

@@ -325,7 +325,8 @@ public class GoodsSpuController {
             List<Long> spuIds = goodsSkus.stream().map(GoodsSku::getSpuId).distinct().collect(Collectors.toList());
             List<Long> spuSpecIds = goodsSkus.stream().filter(a->a.getSpecialFlag()!=null
                     &&a.getSpecialFlag().equals(1)).map(GoodsSku::getSpuId).distinct().collect(Collectors.toList());
-            spuSpecIds.add(0L);
+            spuSpecIds.add(-1L);
+            spuIds.add(-1L);
 
             LambdaQueryWrapper<GoodsSpu> spuLqw = new LambdaQueryWrapper<>();
             spuLqw.in(GoodsSpu::getId,spuIds);

src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java

@@ -85,6 +85,18 @@ public class TbsBudgetCheckController {
         return R.ok();
     }
 
+
+    /**
+     * 补偿批量单子
+     * @param batchId
+     * @return
+     */
+    @PostMapping("runBatchCompensate/{batchId}")
+    public R<?> runBatchCompensate(@PathVariable("batchId") Long batchId){
+        tbsBudgetBatchOperationService.runCompensate(batchId+"");
+        return R.ok();
+    }
+
     /**
      * 提交更新申请
      * @param param

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyTestController.java

@@ -39,6 +39,9 @@ import com.qs.serve.modules.tbs.mapper.TbsBudgetLogMapper;
 import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
 import com.qs.serve.modules.tbs.service.*;
 import com.qs.serve.modules.tbs.service.impl.TbsCostApplyOperationServiceImpl;
+import com.qs.serve.modules.vtb.common.VtbVerificationState;
+import com.qs.serve.modules.vtb.entity.VtbVerification;
+import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -89,6 +92,91 @@ public class TbsCostApplyTestController {
     private TbsBudgetLogService budgetLogService;
     private SysTableTempMapper sysTableTempMapper;
     private TbsBudgetConditionMapper tbsBudgetConditionMapper;
+    private VtbVerificationMapper vtbVerificationMapper;
+
+
+    @GetMapping("/toDoBack")
+    public R<?> toDoBack(){
+        Long[] ids = new Long[]{
+
+        };
+        for (Long id : ids) {
+            backCommit(id+"");
+        }
+        return R.ok();
+    }
+
+    /**
+     * 回退进行中的流程
+     * @param costApplyId
+     * @return
+     */
+    public boolean backCommit( String costApplyId){
+        TbsCostApply costApply = tbsCostApplyService.getById(costApplyId);
+        if(costApply.getChargeState().equals(TbsCostApplyState.State_2_actioning.getCode())||
+                costApply.getChargeState().equals(TbsCostApplyState.State_1_apply.getCode())){
+            //判断是否有核销
+            List<VtbVerification> vtbVerificationList = vtbVerificationMapper.selectList(new LambdaQueryWrapper<VtbVerification>()
+                    .eq(VtbVerification::getCostApplyId,costApplyId)
+            );
+            //有完成的不进行回退
+            for (VtbVerification verification : vtbVerificationList) {
+                if (verification.getVerificationState().equals(VtbVerificationState.Finished.getCode())){
+                    SysTableTemp sysTableTemp = new SysTableTemp();
+                    sysTableTemp.setTableName("VtbVerification");
+                    sysTableTemp.setTableId(""+verification.getId());
+                    sysTableTemp.setRemark(verification.getVerificationCode());
+                    sysTableTemp.setOptionTitle("关闭核销失败");
+                    sysTableTempMapper.insert(sysTableTemp);
+                    return false;
+                }
+            }
+            //更新核销状态
+            for (VtbVerification verification : vtbVerificationList) {
+                if (verification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){
+                    verification.setVerificationState(VtbVerificationState.Close.getCode());
+                    SysTableTemp sysTableTemp = new SysTableTemp();
+                    sysTableTemp.setTableName("VtbVerification");
+                    sysTableTemp.setTableId(""+verification.getId());
+                    sysTableTemp.setRemark(verification.getVerificationCode());
+                    sysTableTemp.setOptionTitle("关闭核销");
+                    sysTableTempMapper.insert(sysTableTemp);
+                    vtbVerificationMapper.updateById(verification);
+                }
+            }
+            //是否budgetLog费用
+            LambdaQueryWrapper<TbsBudgetLog> bLqw = new LambdaQueryWrapper<>();
+            bLqw.eq(TbsBudgetLog::getCostApplyId,costApplyId);
+            List<TbsBudgetLog> dbbudgetLogs = budgetLogService.list(bLqw);
+            for (TbsBudgetLog budgetLog : dbbudgetLogs) {
+                budgetLog.setRemark("toDel3");
+            }
+            budgetLogService.updateBatchById(dbbudgetLogs);
+            List<Long> budIds = dbbudgetLogs.stream().map(TbsBudgetLog::getId).collect(Collectors.toList());
+            budgetLogService.removeBatchByIds(budIds);
+            //移除TbsBudgetCostItem
+            LambdaQueryWrapper<TbsBudgetCostItem> citemLqw = new LambdaQueryWrapper<>();
+            citemLqw.eq(TbsBudgetCostItem::getCostApplyId,costApplyId);
+            List<TbsBudgetCostItem> itemList = budgetCostItemService.list(citemLqw);
+            // 设置remark标记防止误删,移除旧的记录
+            for (TbsBudgetCostItem costItem : itemList) {
+                costItem.setRemark("toDel3");
+            }
+            budgetCostItemService.updateBatchById(itemList);
+            List<Long> itemIds = itemList.stream().map(TbsBudgetCostItem::getId).collect(Collectors.toList());
+            budgetCostItemService.removeBatchByIds(itemIds);
+            //修改状态
+            costApply.setChargeState(TbsCostApplyState.State_0_unPublish.getCode());
+            tbsCostApplyMapper.updateById(costApply);
+
+            SysTableTemp sysTableTemp = new SysTableTemp();
+            sysTableTemp.setTableName("costApply");
+            sysTableTemp.setTableId(""+costApply.getId());
+            sysTableTemp.setOptionTitle("退回草稿");
+            sysTableTempMapper.insert(sysTableTemp);
+        }
+        return true;
+    }
 
     /**
      * 判断预算商品的条件是否匹配
@@ -102,11 +190,11 @@ public class TbsCostApplyTestController {
         return R.ok();
     }
 
-    @GetMapping("reBuildGoods")
+    //@GetMapping("reBuildGoods")
     public R<?> reBuildGoods(){
         List<Long> costIds = sysTableTempMapper.getGoodsUnMatchCostIds();
         for (Long costId : costIds) {
-            overRebuildCost(costId);
+            //overRebuildCost(costId);
         }
         return R.ok();
     }
@@ -155,6 +243,11 @@ public class TbsCostApplyTestController {
     }
 
 
+    /**
+     * 有bug
+     * @param costApplyId
+     * @return
+     */
     public R<?> overRebuildCost(Long costApplyId){
         SysTableTemp sysTableTemp = new SysTableTemp();
         sysTableTemp.setTableName("tbs_cost_apply");
@@ -263,6 +356,7 @@ public class TbsCostApplyTestController {
                     }
                 }
                 TbsBudgetLog budgetLog = TbsBudgetLogBuildUtil.buildTbsBudgetLog(BudgetLogOptFlag.State_1,sysUser, costApply, itemBudget, centerGoods,centerGoods.getCenterGoodsAmount(),currActivity);
+                budgetLog.setRemark("tr2");
                 budgetLogList.add(budgetLog);
 
                 costItem.setBudgetId(itemBudget.getBudgetId());

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java

@@ -78,6 +78,8 @@ public class TbsCostTodoController {
         return R.ok(list);
     }
 
+
+
     /**
      * 我的翻页
      * @param param

src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetLogWithAmount.java

@@ -11,8 +11,19 @@ import java.math.BigDecimal;
 @Data
 public class TbsBudgetLogWithAmount {
 
+    /**
+     * 预算id
+     */
     Long id;
 
+    /**
+     * 预算itemId
+     */
+    Long itemid;
+
+    /**
+     * 预算item金额
+     */
     BigDecimal amt;
 
 }

src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetWithAmount.java

@@ -26,6 +26,10 @@ public class TbsBudgetWithAmount {
 
     String centerType;
 
+    String scheduleItemBudgetId;
+
+    String scheduleItemBudgetName;
+
     /**
      * 预算总额
      */

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java

@@ -665,7 +665,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
         }
 
         for (int ii = 0; ii < currentActivityCenterList.size(); ii++) {
-            TbsActivityCenter activityCenter = activityCenterList.get(ii);
+            TbsActivityCenter activityCenter = currentActivityCenterList.get(ii);
             boolean eqActivity = activityCenter.getActivityId().equals(subject.getActivityId());
             boolean eqSubject = activityCenter.getSubjectId().equals(subject.getSubjectId());
             if(eqActivity&&eqSubject){

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java

@@ -16,10 +16,7 @@ import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
 import com.qs.serve.modules.tbs.service.TbsScheduleItemBudgetService;
 
 import java.time.LocalDate;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -219,13 +216,13 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl<TbsScheduleIte
         budgetLqw.eq(TbsBudget::getBudgetState,1);
         List<TbsBudget> budgetList = tbsBudgetMapper.selectList(budgetLqw);
 
-        List<Long> budgetIds;
+        Set<Long> budgetIds;
 
         if(CollectionUtil.isNotEmpty(param.getBrandIds())){
             //无品牌条件
             budgetIds = budgetList.stream()
                     .filter(a->a.getConditionFlag().equals(0))
-                    .map(TbsBudget::getId).collect(Collectors.toList());
+                    .map(TbsBudget::getId).collect(Collectors.toSet());
 
             //筛选符合品牌条件
             List<Long> conBudgetIds = budgetList.stream()
@@ -241,26 +238,26 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl<TbsScheduleIte
             budgetIds.addAll(conBudgetIds);
         }else {
             //加载所有
-            budgetIds =  budgetList.stream().map(TbsBudget::getId).collect(Collectors.toList());
+            budgetIds =  budgetList.stream().map(TbsBudget::getId).collect(Collectors.toSet());
         }
 
         budgetIds.add(0L);
 
         // 预算金额
-        List<TbsBudgetLogWithAmount> finalList = tbsBudgetLog2Mapper.getSumFinalAmtInList(budgetIds, BudgetLogOptFlag.getFinalBudgetOptFlag());
+        List<TbsBudgetLogWithAmount> finalList = tbsBudgetLog2Mapper.getSumFinalAmtInList(new ArrayList<>(budgetIds), BudgetLogOptFlag.getFinalBudgetOptFlag());
 
         // 被占用金额
-        List<TbsBudgetLogWithAmount> usedList = tbsBudgetLog2Mapper.getSumAmtNotInList(budgetIds, BudgetLogOptFlag.getFinalBudgetOptFlag());
+        List<TbsBudgetLogWithAmount> usedList = tbsBudgetLog2Mapper.getSumAmtNotInList(new ArrayList<>(budgetIds), BudgetLogOptFlag.getFinalBudgetOptFlag());
 
         // 费用使用金额
-        List<TbsBudgetLogWithAmount> costUsedList = tbsBudgetLog2Mapper.getSumAmtInList(budgetIds, BudgetLogOptFlag.finalCostOptFlag);
+        List<TbsBudgetLogWithAmount> costUsedList = tbsBudgetLog2Mapper.getSumAmtInList(new ArrayList<>(budgetIds), BudgetLogOptFlag.finalCostOptFlag);
 
         // 政策使用金额
-        List<TbsBudgetLogWithAmount> policyUsedList = tbsBudgetLog2Mapper.getSumAmtInList(budgetIds, BudgetLogOptFlag.finalPolicyOptFlag);
+        List<TbsBudgetLogWithAmount> policyUsedList = tbsBudgetLog2Mapper.getSumAmtInList(new ArrayList<>(budgetIds), BudgetLogOptFlag.finalPolicyOptFlag);
 
-        List<TbsBudgetLogWithAmount> policyCheckingList = tbsBudgetLog2Mapper.getPolicyCheckingList(budgetIds, BudgetLogOptFlag.finalPolicyOptFlag);
+        List<TbsBudgetLogWithAmount> policyCheckingList = tbsBudgetLog2Mapper.getPolicyCheckingList(new ArrayList<>(budgetIds), BudgetLogOptFlag.finalPolicyOptFlag);
 
-        List<TbsBudgetLogWithAmount> costCheckingList = tbsBudgetLog2Mapper.getCostCheckingList(budgetIds, BudgetLogOptFlag.finalCostOptFlag);
+        List<TbsBudgetLogWithAmount> costCheckingList = tbsBudgetLog2Mapper.getCostCheckingList(new ArrayList<>(budgetIds), BudgetLogOptFlag.finalCostOptFlag);
 
         List<TbsBudgetWithAmount> result = new ArrayList<>();
 
@@ -268,73 +265,86 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl<TbsScheduleIte
             if(budgetId.equals(0L)){
                 continue;
             }
-            TbsBudgetWithAmount withAmount = new TbsBudgetWithAmount();
+
-            withAmount.setBudgetId(budgetId+"");
+            //拓展周期项
-
+            List<TbsScheduleItemBudget> scheduleItemBudgetList = scheduleItemBudget2Mapper.selectList(
-            for (TbsBudget budget : budgetList) {
+                    new LambdaQueryWrapper<TbsScheduleItemBudget>()
-                if(budget.getId().equals(budgetId)){
+                            .eq(TbsScheduleItemBudget::getBudgetId,budgetId)
-                    withAmount.setBudgetName(budget.getBudgetCode());
+            );
-                    withAmount.setCenterId(budget.getCenterId());
+
-                    withAmount.setCenterName(budget.getCenterName());
+            for (TbsScheduleItemBudget itemBudget : scheduleItemBudgetList) {
-                    withAmount.setCenterType(budget.getCenterType());
+                Long itemId = itemBudget.getId();
-                    withAmount.setScheduleName(budget.getScheduleName());
+                TbsBudgetWithAmount withAmount = new TbsBudgetWithAmount();
+                withAmount.setBudgetId(budgetId+"");
+                withAmount.setScheduleItemBudgetId(itemId+"");
+                withAmount.setScheduleItemBudgetName(itemBudget.getItemName());
+
+                for (TbsBudget budget : budgetList) {
+                    if(budget.getId().equals(budgetId)){
+                        withAmount.setBudgetName(budget.getBudgetCode());
+                        withAmount.setCenterId(budget.getCenterId());
+                        withAmount.setCenterName(budget.getCenterName());
+                        withAmount.setCenterType(budget.getCenterType());
+                        withAmount.setScheduleName(budget.getScheduleName());
+                    }
                 }
-            }
 
-            for (TbsBudgetLogWithAmount obj : finalList) {
+                for (TbsBudgetLogWithAmount obj : finalList) {
-                if(budgetId.equals(obj.getId())){
+                    if(budgetId.equals(obj.getId())&&itemId.equals(obj.getItemid())){
-                    withAmount.setFinalAmt(obj.getAmt());
+                        withAmount.setFinalAmt(obj.getAmt());
-                    break;
+                        break;
+                    }
                 }
-            }
+                for (TbsBudgetLogWithAmount obj : usedList) {
-            for (TbsBudgetLogWithAmount obj : usedList) {
+                    if(budgetId.equals(obj.getId())&&itemId.equals(obj.getItemid())){
-                if(budgetId.equals(obj.getId())){
+                        withAmount.setAllUsingAmt(obj.getAmt());
-                    withAmount.setAllUsingAmt(obj.getAmt());
+                        break;
-                    break;
+                    }
                 }
-            }
 
-            for (TbsBudgetLogWithAmount obj : costUsedList) {
+                for (TbsBudgetLogWithAmount obj : costUsedList) {
-                if(budgetId.equals(obj.getId())){
+                    if(budgetId.equals(obj.getId())&&itemId.equals(obj.getItemid())){
-                    withAmount.setCostUsingAmt(obj.getAmt());
+                        withAmount.setCostUsingAmt(obj.getAmt());
-                    break;
+                        break;
+                    }
                 }
-            }
+                for (TbsBudgetLogWithAmount obj : policyUsedList) {
-            for (TbsBudgetLogWithAmount obj : policyUsedList) {
+                    if(budgetId.equals(obj.getId())&&itemId.equals(obj.getItemid())){
-                if(budgetId.equals(obj.getId())){
+                        withAmount.setPolicyUsingAmt(obj.getAmt());
-                    withAmount.setPolicyUsingAmt(obj.getAmt());
+                        break;
-                    break;
+                    }
                 }
-            }
+                for (TbsBudgetLogWithAmount obj : costCheckingList) {
-            for (TbsBudgetLogWithAmount obj : costCheckingList) {
+                    if(budgetId.equals(obj.getId())&&itemId.equals(obj.getItemid())){
-                if(budgetId.equals(obj.getId())){
+                        withAmount.setCostCheckingAmt(obj.getAmt());
-                    withAmount.setCostCheckingAmt(obj.getAmt());
+                        break;
-                    break;
+                    }
                 }
-            }
+                for (TbsBudgetLogWithAmount obj : policyCheckingList) {
-            for (TbsBudgetLogWithAmount obj : policyCheckingList) {
+                    if(budgetId.equals(obj.getId())&&itemId.equals(obj.getItemid())){
-                if(budgetId.equals(obj.getId())){
+                        withAmount.setPolicyCheckingAmt(obj.getAmt());
-                    withAmount.setPolicyCheckingAmt(obj.getAmt());
+                        break;
-                    break;
+                    }
                 }
+
+                //因为log统计为负数，需要把数值取正
+                withAmount.setAllUsingAmt(withAmount.getAllUsingAmt().negate());
+                withAmount.setCostUsingAmt(withAmount.getCostUsingAmt().negate());
+                withAmount.setCostCheckingAmt(withAmount.getCostCheckingAmt().negate());
+                withAmount.setPolicyUsingAmt(withAmount.getPolicyUsingAmt().negate());
+                withAmount.setPolicyCheckingAmt(withAmount.getPolicyCheckingAmt().negate());
+                //计算剩余及审批合计
+                withAmount.setAllCheckingAmt(withAmount.getCostCheckingAmt().add(withAmount.getPolicyCheckingAmt()));
+                withAmount.setSurplusAmt(withAmount.getFinalAmt().subtract(withAmount.getAllUsingAmt()));
+                result.add(withAmount);
             }
-            //因为log统计为负数，需要把数值取正
-            withAmount.setAllUsingAmt(withAmount.getAllUsingAmt().negate());
-            withAmount.setCostUsingAmt(withAmount.getCostUsingAmt().negate());
-            withAmount.setCostCheckingAmt(withAmount.getCostCheckingAmt().negate());
-            withAmount.setPolicyUsingAmt(withAmount.getPolicyUsingAmt().negate());
-            withAmount.setPolicyCheckingAmt(withAmount.getPolicyCheckingAmt().negate());
-            //计算剩余及审批合计
-            withAmount.setAllCheckingAmt(withAmount.getCostCheckingAmt().add(withAmount.getPolicyCheckingAmt()));
-            withAmount.setSurplusAmt(withAmount.getFinalAmt().subtract(withAmount.getAllUsingAmt()));
-            result.add(withAmount);
-        }
 
-        result.sort(
+        }
-                Comparator.comparing(TbsBudgetWithAmount::getCenterName)
+//        result.sort(
-                        .thenComparing(TbsBudgetWithAmount::getScheduleName)
+//                Comparator.comparing(TbsBudgetWithAmount::getCenterName)
-                        .thenComparing(TbsBudgetWithAmount::getBudgetName)
+//                        .thenComparing(TbsBudgetWithAmount::getScheduleName)
-        );
+//                        .thenComparing(TbsBudgetWithAmount::getBudgetName)
+//        );
 
         return result;
     }

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

@@ -40,6 +40,7 @@
     <select id="getSumFinalAmtInList" resultType="com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogWithAmount">
         select
         budget_id as id,
+        schedule_item_budget_id as itemid,
         sum(amount) as amt
         from tbs_budget_log
         where
@@ -51,12 +52,13 @@
         <foreach collection="selectIds" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
-        group by budget_id
+        group by schedule_item_budget_id
     </select>
 
     <select id="getSumAmtInList" resultType="com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogWithAmount">
         select
         budget_id as id,
+        schedule_item_budget_id as itemid,
         sum(amount) as amt
         from tbs_budget_log
         where
@@ -68,12 +70,13 @@
         <foreach collection="selectIds" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
-        group by budget_id
+        group by schedule_item_budget_id
     </select>
 
     <select id="getSumAmtNotInList" resultType="com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogWithAmount">
         select
         budget_id as id,
+        schedule_item_budget_id as itemid,
         sum(amount) as amt
         from tbs_budget_log
         where
@@ -85,12 +88,13 @@
         <foreach collection="selectIds" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
-        group by budget_id
+        group by schedule_item_budget_id
     </select>
 
     <select id="getPolicyCheckingList" resultType="com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogWithAmount">
         select
         tbs_budget_log.budget_id as id,
+        tbs_budget_log.schedule_item_budget_id as itemid,
         sum(amount) as amt
         from tbs_budget_log
         left join tzc_policy on tbs_budget_log.policy_id = tzc_policy.id
@@ -107,12 +111,13 @@
         <foreach collection="selectIds" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
-        group by tbs_budget_log.budget_id
+        group by tbs_budget_log.schedule_item_budget_id
     </select>
 
     <select id="getCostCheckingList" resultType="com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogWithAmount">
         select
         tbs_budget_log.budget_id as id,
+        tbs_budget_log.schedule_item_budget_id as itemid,
         sum(amount) as amt
         from tbs_budget_log
         left join tbs_cost_apply on tbs_budget_log.cost_apply_id = tbs_cost_apply.id
@@ -129,7 +134,7 @@
         <foreach collection="selectIds" item ="selectId" index="i" open="(" close=")" separator=",">
             #{selectId}
         </foreach>
-        group by tbs_budget_log.budget_id
+        group by tbs_budget_log.schedule_item_budget_id
     </select>
 
 </mapper>