From 6c013b377d3d483cda6fadf784feb67899844c50 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Mon, 17 Jul 2023 23:33:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E6=9C=AC=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E8=BF=81=E7=A7=BB=E5=87=BD=E6=95=B0=EF=BC=8C=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E9=A2=84=E7=AE=97=E5=92=8C=E8=B4=B9=E7=94=A8=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A5=E4=B8=8B=E8=A1=A8=EF=BC=8C=E6=B8=85?= =?UTF-8?q?=E7=90=86=E6=97=A7=E7=9A=84=E9=A2=84=E7=AE=97=20=E9=A2=84?= =?UTF-8?q?=E7=AE=97=E8=A1=A8*2=20=E9=A2=84=E7=AE=97LOG=E8=A1=A8*1=20?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E8=A1=A8*3=20=E6=94=BF=E7=AD=96=E8=A1=A8*2?= =?UTF-8?q?=20=E6=A0=B8=E9=94=80=E6=B5=81=E6=B0=B4=E8=A1=A8*1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bir/controller/BirRoiRateController.java | 11 + .../BirActivityCenterGoodsServiceImpl.java | 17 +- .../tbs/mapper/TbsBudgetConditionMapper.java | 4 + .../mapper/TbsScheduleItemBudgetMapper.java | 1 + .../service/TbsBudgetConditionService.java | 2 + .../modules/tbs/service/TbsBudgetService.java | 2 + .../service/TbsScheduleItemBudgetService.java | 5 + .../impl/TbsBudgetConditionServiceImpl.java | 6 + .../service/impl/TbsBudgetServiceImpl.java | 196 +++++++++++++++++- .../TbsScheduleItemBudgetServiceImpl.java | 4 + .../mapper/tbs/TbsBudgetConditionMapper.xml | 8 + .../tbs/TbsScheduleItemBudgetMapper.xml | 9 +- 12 files changed, 246 insertions(+), 19 deletions(-) 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 e2e7ab27..c15f30f2 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 @@ -18,6 +18,7 @@ import com.qs.serve.modules.bir.service.BirActivityCenterGoodsService; import com.qs.serve.modules.bir.service.BirBaseActivityService; import com.qs.serve.modules.bir.service.BirReportAccountBookService; import com.qs.serve.modules.tbs.common.TbsCenterType; +import com.qs.serve.modules.tbs.service.TbsBudgetService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; @@ -44,6 +45,7 @@ public class BirRoiRateController { private BirBaseActivityService activityService; private BirActivityCenterGoodsService activityCenterGoodsService; private BirReportAccountBookService birReportAccountBookService; + private TbsBudgetService tbsBudgetService; /** * 台账数据集 @@ -70,6 +72,15 @@ public class BirRoiRateController { // list.add(rateItem); // return R.ok(); // } + /** + * + * @return + */ + @GetMapping("/test23") + public R test(String sourceId,String sourceType,String targetId,String targetType){ + tbsBudgetService.moveCenterBudgetAndCostAmount(sourceId,sourceType,targetId,targetType); + return R.ok(); + } /** * diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java index ddb9f247..cbb543ca 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java @@ -306,22 +306,23 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl { + @InterceptorIgnore(tenantLine = "true") + Long findUnMatchConditionBySourceBudgetIdAndTargetBudgetId(@Param("sourceId")Long sourceId, @Param("targetId")Long targetId); } diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java index 3b9de7c4..f5e7a531 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java @@ -142,6 +142,7 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper List getByBudgetId(Long budgetId); + Long findUnMatchConditionBySourceBudgetIdAndTargetBudgetId(Long sourceId,Long targetId); + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java index af4821d3..f6453f20 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java @@ -40,5 +40,7 @@ public interface TbsBudgetService extends IService { TbsBudgetVo toVoEntity(TbsBudget budget); TbsBudgetVo getEntityForExcel(TbsBudget budget); + + void moveCenterBudgetAndCostAmount(String sourceId,String sourceType,String targetId,String targetType); } 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 e434159c..9a3acf39 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 @@ -1,5 +1,6 @@ package com.qs.serve.modules.tbs.service; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget; @@ -15,5 +16,9 @@ import java.util.List; public interface TbsScheduleItemBudgetService extends IService { List betweenDateList(LocalDate startDate,LocalDate endDate); + + @InterceptorIgnore(tenantLine = "true") + Long findUnMatchScheduleItemBySourceBudgetIdAndTargetBudgetId(Long sourceId,Long targetId); + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetConditionServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetConditionServiceImpl.java index 0234a810..1e071f02 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetConditionServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetConditionServiceImpl.java @@ -27,5 +27,11 @@ public class TbsBudgetConditionServiceImpl extends ServiceImpl private final TbsScheduleItemService scheduleItemService; private final TbsCenterDtoService tbsCenterDtoService; - private TbsBudgetConditionService tbsBudgetConditionService; - private TbsScheduleItemBudgetService tbsScheduleItemBudgetService; - private final GoodsSkuService goodsSkuService; private final GoodsSpuService goodsSpuService; private final GoodsCategoryService goodsCategoryService; private final SysUserService sysUserService; + private final TbsActivityCenterService tbsActivityCenterService; + private final TbsActivityCenterGoodsService tbsActivityCenterGoodsService; + private final TbsBudgetCostItemService tbsBudgetCostItemService; + private final TzcPolicyItemService tzcPolicyItemService; + private final TbsBudgetCostItemPolicyService tbsBudgetCostItemPolicyService; + private final VtbFundFlowService vtbFundFlowService; + @Override @Transactional(rollbackFor = Exception.class) public void modify(TbsBudgetBo budgetBo) { @@ -83,7 +94,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl //移除旧的条件数据 LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(TbsBudgetCondition::getBudgetId,budget.getId()); - tbsBudgetConditionService.remove(lqw); + budgetConditionService.remove(lqw); }else { budget = CopierUtil.copy(budgetBo,new TbsBudget()); } @@ -206,7 +217,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl lqw.eq(TbsBudgetCondition::getTargetType,targetType); lqw.in(TbsBudgetCondition::getTargetId, targetIds); lqw.in(TbsBudgetCondition::getBudgetId,budgetIds); - List conditions = tbsBudgetConditionService.list(lqw); + List conditions = budgetConditionService.list(lqw); if(conditions.size()<1){ return new ArrayList<>(); } @@ -215,7 +226,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl LambdaQueryWrapper lqw2 = new LambdaQueryWrapper<>(); lqw2.eq(TbsBudgetCondition::getTargetType,targetType); lqw2.in(TbsBudgetCondition::getBudgetId,budgetIds); - List conditions2 = tbsBudgetConditionService.list(lqw2); + List conditions2 = budgetConditionService.list(lqw2); Map> conditions2Map = conditions2.stream() .collect(Collectors.groupingBy(TbsBudgetCondition::getBudgetId)); List selectBudgetIds = new ArrayList<>(); @@ -278,12 +289,12 @@ public class TbsBudgetServiceImpl extends ServiceImpl } LambdaQueryWrapper lqw2 = new LambdaQueryWrapper<>(); lqw2.in(TbsScheduleItemBudget::getBudgetId,budgetIds); - List scheduleItemBudgets = tbsScheduleItemBudgetService.list(lqw2); + List scheduleItemBudgets = scheduleItemBudgetService.list(lqw2); Map> listScheduleMapByBudgetId = scheduleItemBudgets.stream().collect(Collectors.groupingBy(TbsScheduleItemBudget::getBudgetId)); //加载条件 LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.in(TbsBudgetCondition::getBudgetId,budgetIds); - List budgetConditions = tbsBudgetConditionService.list(lqw); + List budgetConditions = budgetConditionService.list(lqw); Map> listConditionMapByBudgetId = budgetConditions.stream().collect(Collectors.groupingBy(TbsBudgetCondition::getBudgetId)); //拼装 return budgetList.stream().map(budget->{ @@ -394,7 +405,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl public TbsBudgetVo toVoEntity(TbsBudget budget) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(TbsBudgetCondition::getBudgetId,budget.getId()); - List budgetConditions = tbsBudgetConditionService.list(lqw); + List budgetConditions = budgetConditionService.list(lqw); Map> listMap = budgetConditions.stream().collect(Collectors.groupingBy(TbsBudgetCondition::getTargetType)); TbsBudgetVo budgetVo = CopierUtil.copy(budget,new TbsBudgetVo()); budgetVo.setBrandConditions(listMap.get(TbsGoodsType.brand.name())); @@ -416,7 +427,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl budgetVo.setSpuConditions(listMap.get(TbsGoodsType.spu.name())); LambdaQueryWrapper lqw2 = new LambdaQueryWrapper<>(); lqw2.eq(TbsScheduleItemBudget::getBudgetId,budget.getId()); - List scheduleItemBudgets = tbsScheduleItemBudgetService.list(lqw2); + List scheduleItemBudgets = scheduleItemBudgetService.list(lqw2); budgetVo.setScheduleItem(scheduleItemBudgets); return budgetVo; } @@ -669,7 +680,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl TbsBudgetVo budgetVo = CopierUtil.copy(budget,new TbsBudgetVo()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(TbsScheduleItemBudget::getBudgetId,budget.getId()); - List tbsScheduleItemBudgetList = tbsScheduleItemBudgetService.list(lqw); + List tbsScheduleItemBudgetList = scheduleItemBudgetService.list(lqw); tbsScheduleItemBudgetList.forEach(a->{ LambdaQueryWrapper lqwLog = new LambdaQueryWrapper<>(); lqwLog.eq(TbsBudgetLog::getScheduleItemBudgetId,a.getId()); @@ -693,5 +704,168 @@ public class TbsBudgetServiceImpl extends ServiceImpl budgetVo.setScheduleItemBudgets(tbsScheduleItemBudgetList); return budgetVo; } + + @Override + public void moveCenterBudgetAndCostAmount(String sourceId,String sourceType,String targetId,String targetType){ + SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); + + LambdaQueryWrapper budgetLqw = new LambdaQueryWrapper<>(); + budgetLqw.eq(TbsBudget::getCenterType,sourceType); + budgetLqw.eq(TbsBudget::getCenterId,sourceId); + List tbsBudgetSourceList = this.list(budgetLqw); + + LambdaQueryWrapper budgetTargetLqw = new LambdaQueryWrapper<>(); + budgetTargetLqw.eq(TbsBudget::getCenterType,targetType); + budgetTargetLqw.eq(TbsBudget::getCenterId,targetId); + List tbsBudgetTargetList = this.list(budgetTargetLqw); + + Map mapSourceTargetTbsbudget = new HashMap<>(); + for(TbsBudget tbsBudgetSouce:tbsBudgetSourceList){ + TbsBudget tbsBudgetTargetMatch = null; + for(TbsBudget tbsBudgetTarget:tbsBudgetTargetList){ + Long unMatchCountCondition = budgetConditionService.findUnMatchConditionBySourceBudgetIdAndTargetBudgetId(tbsBudgetSouce.getId(),tbsBudgetTarget.getId()); + Long unMatchCountScheduleItem = scheduleItemBudgetService.findUnMatchScheduleItemBySourceBudgetIdAndTargetBudgetId(tbsBudgetSouce.getId(),tbsBudgetTarget.getId()); + if(unMatchCountCondition==0 && unMatchCountScheduleItem==0){ + tbsBudgetTargetMatch = tbsBudgetTarget; + mapSourceTargetTbsbudget.put(tbsBudgetSouce,tbsBudgetTarget); + break; + } + } + if(tbsBudgetTargetMatch==null){ + Assert.throwEx("存在不匹配条件或周期的预算！"+tbsBudgetSouce.getBudgetCode()); + } + } + + for(TbsBudget tbsBudgetSouce:tbsBudgetSourceList) { + TbsBudget tartgetBudget = mapSourceTargetTbsbudget.get(tbsBudgetSouce); + LambdaQueryWrapper tsibLqw = new LambdaQueryWrapper<>(); + tsibLqw.eq(TbsScheduleItemBudget::getBudgetId,tbsBudgetSouce.getId()); + List scheduleItemBudgetList = scheduleItemBudgetService.list(tsibLqw); + //源预算周期 + for(TbsScheduleItemBudget tsib:scheduleItemBudgetList){ + LambdaQueryWrapper tsibTargetLqw = new LambdaQueryWrapper<>(); + tsibTargetLqw.eq(TbsScheduleItemBudget::getBudgetId,tartgetBudget.getId()); + tsibTargetLqw.ge(TbsScheduleItemBudget::getEndDate,tsib.getEndDate()); + tsibTargetLqw.le(TbsScheduleItemBudget::getStartDate,tsib.getStartDate()); + TbsScheduleItemBudget tsibTarget = scheduleItemBudgetService.getOne(tsibTargetLqw,false); + + //调增Log + TbsBudgetLog budgetLog = TbsBudgetLogBuildUtil.toTbsBudgetLog(sysUser,tartgetBudget,tsibTarget,BudgetLogOptFlag.State_2, tsib.getBudgetAmount()); + budgetLogService.save(budgetLog); + LambdaQueryWrapper tsibRemoveLqw = new LambdaQueryWrapper<>(); + tsibRemoveLqw.eq(TbsBudgetLog::getScheduleItemBudgetId,tsib.getId()); + tsibRemoveLqw.eq(TbsBudgetLog::getOptType,BudgetLogOptFlag.State_0.getCode()); + budgetLogService.remove(tsibRemoveLqw); + + //更新发货目标 + BigDecimal preDispatchAmount = tsibTarget.getPreDispatchAmount()==null?BigDecimal.ZERO:tsibTarget.getPreDispatchAmount(); + preDispatchAmount = preDispatchAmount.add(tsib.getPreDispatchAmount()==null?BigDecimal.ZERO:tsib.getPreDispatchAmount()); + tsibTarget.setPreDispatchAmount(preDispatchAmount); + scheduleItemBudgetService.updateById(tsibTarget); + + //tbs_activity_center + LambdaUpdateWrapper tacLuw = new LambdaUpdateWrapper<>(); + tacLuw.set(TbsActivityCenter::getCenterType,targetType); + tacLuw.set(TbsActivityCenter::getCenterId,targetId); + tacLuw.set(TbsActivityCenter::getCenterName,tartgetBudget.getCenterName()); + tacLuw.eq(TbsActivityCenter::getCenterType,sourceType); + tacLuw.eq(TbsActivityCenter::getCenterId,sourceId); + tacLuw.eq(TbsActivityCenter::getCenterName,tbsBudgetSouce.getCenterName()); + tbsActivityCenterService.update(tacLuw); + + //tbs_activity_center_goods + LambdaUpdateWrapper tacgLuw = new LambdaUpdateWrapper<>(); + tacgLuw.set(TbsActivityCenterGoods::getCenterType,targetType); + tacgLuw.set(TbsActivityCenterGoods::getCenterId,targetId); + tacgLuw.set(TbsActivityCenterGoods::getCenterName,tartgetBudget.getCenterName()); + tacgLuw.eq(TbsActivityCenterGoods::getCenterType,sourceType); + tacgLuw.eq(TbsActivityCenterGoods::getCenterId,sourceId); + tacgLuw.eq(TbsActivityCenterGoods::getCenterName,tbsBudgetSouce.getCenterName()); + tbsActivityCenterGoodsService.update(tacgLuw); + + //tbs_budget_cost_item + LambdaUpdateWrapper tbciLuw = new LambdaUpdateWrapper<>(); + tbciLuw.set(TbsBudgetCostItem::getCenterType,targetType); + tbciLuw.set(TbsBudgetCostItem::getCenterId,targetId); + tbciLuw.set(TbsBudgetCostItem::getCenterName,tartgetBudget.getCenterName()); + tbciLuw.set(TbsBudgetCostItem::getBudgetId,tsibTarget.getBudgetId()); + tbciLuw.set(TbsBudgetCostItem::getScheduleId,tsibTarget.getScheduleId()); + tbciLuw.set(TbsBudgetCostItem::getScheduleItemName,tsibTarget.getItemName()); + tbciLuw.set(TbsBudgetCostItem::getScheduleItemId,tsibTarget.getScheduleItemId()); + tbciLuw.set(TbsBudgetCostItem::getScheduleItemBudgetId,tsibTarget.getId()); + tbciLuw.eq(TbsBudgetCostItem::getCenterType,sourceType); + tbciLuw.eq(TbsBudgetCostItem::getCenterId,sourceId); + tbciLuw.eq(TbsBudgetCostItem::getCenterName,tbsBudgetSouce.getCenterName()); + tbciLuw.eq(TbsBudgetCostItem::getScheduleItemBudgetId,tsib.getId()); + tbsBudgetCostItemService.update(tbciLuw); + + //tbs_budget_cost_item_policy + LambdaUpdateWrapper tbcipLuw = new LambdaUpdateWrapper<>(); + tbcipLuw.set(TbsBudgetCostItemPolicy::getCenterType,targetType); + tbcipLuw.set(TbsBudgetCostItemPolicy::getCenterId,targetId); + tbcipLuw.set(TbsBudgetCostItemPolicy::getCenterName,tartgetBudget.getCenterName()); + tbcipLuw.set(TbsBudgetCostItemPolicy::getBudgetId,tsibTarget.getBudgetId()); + tbcipLuw.set(TbsBudgetCostItemPolicy::getScheduleId,tsibTarget.getScheduleId()); + tbcipLuw.set(TbsBudgetCostItemPolicy::getScheduleItemName,tsibTarget.getItemName()); + tbcipLuw.set(TbsBudgetCostItemPolicy::getScheduleItemId,tsibTarget.getScheduleItemId()); + tbcipLuw.set(TbsBudgetCostItemPolicy::getScheduleItemBudgetId,tsibTarget.getId()); + tbcipLuw.eq(TbsBudgetCostItemPolicy::getCenterType,sourceType); + tbcipLuw.eq(TbsBudgetCostItemPolicy::getCenterId,sourceId); + tbcipLuw.eq(TbsBudgetCostItemPolicy::getCenterName,tbsBudgetSouce.getCenterName()); + tbcipLuw.eq(TbsBudgetCostItemPolicy::getScheduleItemBudgetId,tsib.getId()); + tbsBudgetCostItemPolicyService.update(tbcipLuw); + + //tzc_policy_item + LambdaUpdateWrapper tzpiLuw = new LambdaUpdateWrapper<>(); + tzpiLuw.set(TzcPolicyItem::getCenterType,targetType); + tzpiLuw.set(TzcPolicyItem::getCenterId,targetId); + tzpiLuw.set(TzcPolicyItem::getCenterName,tartgetBudget.getCenterName()); + tzpiLuw.eq(TzcPolicyItem::getCenterType,sourceType); + tzpiLuw.eq(TzcPolicyItem::getCenterId,sourceId); + tzpiLuw.eq(TzcPolicyItem::getCenterName,tbsBudgetSouce.getCenterName()); + tzcPolicyItemService.update(tzpiLuw); + + //BudgetLog + LambdaUpdateWrapper tblLuw = new LambdaUpdateWrapper<>(); + tblLuw.set(TbsBudgetLog::getCenterType,targetType); + tblLuw.set(TbsBudgetLog::getCenterId,targetId); + tblLuw.set(TbsBudgetLog::getCenterName,tartgetBudget.getCenterName()); + tblLuw.set(TbsBudgetLog::getBudgetId,tsibTarget.getBudgetId()); + tblLuw.set(TbsBudgetLog::getBudgetCode,tartgetBudget.getBudgetCode()); + tblLuw.set(TbsBudgetLog::getScheduleId,tsibTarget.getScheduleId()); + tblLuw.set(TbsBudgetLog::getItemName,tsibTarget.getItemName()); + tblLuw.set(TbsBudgetLog::getScheduleItemId,tsibTarget.getScheduleItemId()); + tblLuw.set(TbsBudgetLog::getScheduleItemBudgetId,tsibTarget.getId()); + tblLuw.eq(TbsBudgetLog::getCenterType,sourceType); + tblLuw.eq(TbsBudgetLog::getCenterId,sourceId); + tblLuw.eq(TbsBudgetLog::getCenterName,tbsBudgetSouce.getCenterName()); + tblLuw.eq(TbsBudgetLog::getScheduleItemBudgetId,tsib.getId()); + budgetLogService.update(tblLuw); + + //vtb_fund_flow + LambdaUpdateWrapper vffLuw = new LambdaUpdateWrapper<>(); + vffLuw.set(VtbFundFlow::getCenterType,targetType); + vffLuw.set(VtbFundFlow::getCenterId,targetId); + vffLuw.set(VtbFundFlow::getCenterName,tartgetBudget.getCenterName()); + vffLuw.eq(VtbFundFlow::getCenterType,sourceType); + vffLuw.eq(VtbFundFlow::getCenterId,sourceId); + vffLuw.eq(VtbFundFlow::getCenterName,tbsBudgetSouce.getCenterName()); + vtbFundFlowService.update(vffLuw); + + scheduleItemBudgetService.removeById(tsib); + } + LambdaQueryWrapper tbcLqw = new LambdaQueryWrapper<>(); + tbcLqw.eq(TbsBudgetCondition::getBudgetId,tbsBudgetSouce.getId()); + budgetConditionService.remove(tbcLqw); + + LambdaQueryWrapper tbllLqw = new LambdaQueryWrapper<>(); + tbllLqw.eq(TbsBudgetLog::getBudgetId,tbsBudgetSouce.getId()); + budgetLogService.remove(tbllLqw); + + this.removeById(tbsBudgetSouce.getId()); + } + + + } } 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 5122e3fb..0df20d68 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 @@ -31,5 +31,9 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl + diff --git a/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml b/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml index c3a3774b..cbab25ed 100644 --- a/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml +++ b/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml @@ -135,6 +135,13 @@ group by `tbs_budget_log`.budget_id,`tbs_budget_log`.schedule_item_id - +