diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java index d3ce72dd..e333645a 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java @@ -296,7 +296,7 @@ public class BmsRegion2Controller { */ @LimitSubmit(interval = 15000) @GetMapping("/updateLevel") - public R editBatch(){ + public R updateLevel(){ bmsRegion2Service.flushAllLevel(true); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java index 3aea5e2e..46395e53 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java @@ -277,7 +277,7 @@ public class BmsRegionController { */ @LimitSubmit(interval = 15000) @GetMapping("/updateLevel") - public R editBatch(){ + public R updateLevel(){ bmsRegionService.flushAllLevel(true); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 28a7c8aa..ab35d2a6 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -622,6 +622,55 @@ public class BmsSupplierController { return R.ok(); } + @GetMapping("/updateSupplierPath") + public R updateSupplierPath(){ + List supplierList = bmsSupplierService.list( + new LambdaQueryWrapper() + .select( + BmsSupplier::getId,BmsSupplier::getRegion2Third, + BmsSupplier::getRegionThird, + BmsSupplier::getCooperatePauseFlagDate, + BmsSupplier::getStopFlagDate + ) + ); + for (BmsSupplier supplier : supplierList) { + if(supplier.getRegion2Third()!=null){ + BmsRegion2 region2 = bmsRegion2Service.getById(supplier.getRegion2Third()); + if(region2!=null){ + String[] ids = region2.getPathIds().split("_"); + if(ids.length>0){ + supplier.setRegion2First(ids[0]); + } + if(ids.length>1){ + supplier.setRegion2Second(ids[1]); + } + if(ids.length>2){ + supplier.setRegion2Third(ids[2]); + } + } + } + if(supplier.getRegionThird()!=null){ + BmsRegion region1 = bmsRegionService.getById(supplier.getRegionThird()); + if(region1!=null){ + String[] ids = region1.getPathIds().split("_"); + if(ids.length>0){ + supplier.setRegionFirst(ids[0]); + } + if(ids.length>1){ + supplier.setRegionSecond(ids[1]); + } + if(ids.length>2){ + supplier.setRegionThird(ids[2]); + } + } + } + + if(supplier.getRegionThird()!=null || supplier.getRegion2Third()!=null){ + bmsSupplierService.updateById(supplier); + } + } + return R.ok(); + } /** * 更新父级ID 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 fff556e1..b7cb4245 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 @@ -46,5 +46,6 @@ public interface TbsScheduleItemBudgetService extends IService listBudgetAmountByIds(TbsScheduleItemSearch param); + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java index 1a84a4f7..341075ff 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java @@ -584,6 +584,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl budgetVo.setSpuConditions(listMap.get(TbsGoodsType.spu.name())); LambdaQueryWrapper lqw2 = new LambdaQueryWrapper<>(); lqw2.eq(TbsScheduleItemBudget::getBudgetId,budget.getId()); + lqw2.orderByAsc(TbsScheduleItemBudget::getStartDate); List scheduleItemBudgets = scheduleItemBudgetService.list(lqw2); if(budgetVo.getBudgetState().equals(1)) { //已开启才计算 diff --git a/src/main/java/com/qs/serve/task/BmsTask.java b/src/main/java/com/qs/serve/task/BmsTask.java new file mode 100644 index 00000000..92f8d2f9 --- /dev/null +++ b/src/main/java/com/qs/serve/task/BmsTask.java @@ -0,0 +1,37 @@ +package com.qs.serve.task; + +import com.qs.serve.common.util.AuthContextUtils; +import com.qs.serve.modules.bms.controller.BmsRegion2Controller; +import com.qs.serve.modules.bms.controller.BmsRegionController; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * @author YenHex + * @since 2024/5/9 + */ +@Slf4j +@Component +@AllArgsConstructor +@ConditionalOnProperty(value = "project.task", havingValue = "true") +public class BmsTask { + + private final BmsRegion2Controller bmsRegion2Controller; + private final BmsRegionController bmsRegionController; + + /** + * 更新树路径 + */ + @Scheduled(cron="0 0 7,13 * * ?") + public void levelTask(){ + AuthContextUtils.setTenant("001"); + bmsRegionController.updateLevel(); + bmsRegion2Controller.updateLevel(); + //更新客户的关联区域的列 + } + + +}