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 8c9b373c..0eeb4269 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 @@ -146,16 +146,16 @@ public class BirRoiRateController { * @param query * @return */ - @RepeatSubmit - @PostMapping("/costYearMonthV2") - public R> getCostRoiOfYearMonthV2(@RequestBody BirBudgetTargetSo query){ - boolean isRestBir = BirHttpUtil.isRestBir(); - if(isRestBir){ - return BirHttpUtil.post("/bir/roiRate/costYearMonthV2",query); - } - List list = birBudgetTargetService.listVo(query); - return R.ok(list); - } +// @RepeatSubmit +// @PostMapping("/costYearMonthV2") +// public R> getCostRoiOfYearMonthV2(@RequestBody BirBudgetTargetSo query){ +// boolean isRestBir = BirHttpUtil.isRestBir(); +// if(isRestBir){ +// return BirHttpUtil.post("/bir/roiRate/costYearMonthV2",query); +// } +// List list = birBudgetTargetService.listVo(query); +// return R.ok(list); +// } /** * 获取费率 diff --git a/src/main/java/com/qs/serve/modules/bir/service/BirBudgetTargetService.java b/src/main/java/com/qs/serve/modules/bir/service/BirBudgetTargetService.java index 4b232f47..5f6287d8 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/BirBudgetTargetService.java +++ b/src/main/java/com/qs/serve/modules/bir/service/BirBudgetTargetService.java @@ -15,7 +15,7 @@ import java.util.List; */ public interface BirBudgetTargetService extends IService { - List listVo(BirBudgetTargetSo query); +// List listVo(BirBudgetTargetSo query); List listBaseVo(BirBudgetTargetSo query); diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetServiceImpl.java index 893227cf..ab63bfda 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetServiceImpl.java @@ -226,67 +226,67 @@ public class BirBudgetTargetServiceImpl extends ServiceImpl listVo(BirBudgetTargetSo query) { - query.setLoadType(query.getLoadType()-1); - LocalDateTime endMonth = query.getYearMonthEnd(); - LocalDateTime startMonth = query.getYearMonthStart(); - //格式化 - startMonth = startMonth.withDayOfMonth(1).toLocalDate().atTime(0,0,0); - endMonth = endMonth.with(TemporalAdjusters.lastDayOfMonth()).toLocalDate().atTime(23,59,59); - query.setYearMonthStart(startMonth); - query.setYearMonthEnd(endMonth); - - query.setYearStart(startMonth.getYear()); - query.setYearEnd(endMonth.getYear()); - query.setMonthStart(startMonth.getMonthValue()); - query.setMonthEnd(endMonth.getMonthValue()); - - - query.setSelectCenterFlag(0); - if(CollUtil.isNotEmpty(query.getCenterList())){ - query.setSelectCenterFlag(1); - } - - BmsSupplier supplier = bmsSupplierService.getById(query.getSupplierId()); - - if(query.getLoadType()==1){ - query.setBizRegionIds(Arrays.asList(supplier.getRegion2Second())); - }else if(query.getLoadType()==2){ - query.setSaleRegionIds(Arrays.asList(supplier.getRegionSecond())); - }else if(query.getLoadType()==3){ - query.setSaleRegionIds(Arrays.asList(supplier.getRegionFirst())); - } - - List birBudgetTargets = baseMapper.selectBirBudgetTargetList(query); - - query.setLoadType(0); - List birSupplierBudgetTargets = baseMapper.selectBirBudgetTargetList(query); - - Map> listMap = birBudgetTargets.stream() - .collect(Collectors.groupingBy(obj->obj.getYearNum()+"_"+obj.getMonthNum())); - Map> listSupplierMap = birSupplierBudgetTargets.stream() - .collect(Collectors.groupingBy(obj->obj.getYearNum()+"_"+obj.getMonthNum())); - - List budgetTargetVoList = new ArrayList<>(); - - - //12个月 - final int TOTAL_MONTH = 12; - for (int y = startMonth.getYear(); y <= endMonth.getYear(); y++) { - for (int m = 1; m <= TOTAL_MONTH; m++) { - //防止多空白行 - if(y == startMonth.getYear() && m < startMonth.getMonthValue()){ - continue; - } - if(y == endMonth.getYear() && m > endMonth.getMonthValue()){ - continue; - } - budgetTargetVoList.add(getBudgetTargetVo(listMap,listSupplierMap, m, y)); - } - } - return budgetTargetVoList; - } +// @Override +// public List listVo(BirBudgetTargetSo query) { +// query.setLoadType(query.getLoadType()-1); +// LocalDateTime endMonth = query.getYearMonthEnd(); +// LocalDateTime startMonth = query.getYearMonthStart(); +// //格式化 +// startMonth = startMonth.withDayOfMonth(1).toLocalDate().atTime(0,0,0); +// endMonth = endMonth.with(TemporalAdjusters.lastDayOfMonth()).toLocalDate().atTime(23,59,59); +// query.setYearMonthStart(startMonth); +// query.setYearMonthEnd(endMonth); +// +// query.setYearStart(startMonth.getYear()); +// query.setYearEnd(endMonth.getYear()); +// query.setMonthStart(startMonth.getMonthValue()); +// query.setMonthEnd(endMonth.getMonthValue()); +// +// +// query.setSelectCenterFlag(0); +// if(CollUtil.isNotEmpty(query.getCenterList())){ +// query.setSelectCenterFlag(1); +// } +// +// BmsSupplier supplier = bmsSupplierService.getById(query.getSupplierId()); +// +// if(query.getLoadType()==1){ +// query.setBizRegionIds(Arrays.asList(supplier.getRegion2Second())); +// }else if(query.getLoadType()==2){ +// query.setSaleRegionIds(Arrays.asList(supplier.getRegionSecond())); +// }else if(query.getLoadType()==3){ +// query.setSaleRegionIds(Arrays.asList(supplier.getRegionFirst())); +// } +// +// List birBudgetTargets = baseMapper.selectBirBudgetTargetList(query); +// +// query.setLoadType(0); +// List birSupplierBudgetTargets = baseMapper.selectBirBudgetTargetList(query); +// +// Map> listMap = birBudgetTargets.stream() +// .collect(Collectors.groupingBy(obj->obj.getYearNum()+"_"+obj.getMonthNum())); +// Map> listSupplierMap = birSupplierBudgetTargets.stream() +// .collect(Collectors.groupingBy(obj->obj.getYearNum()+"_"+obj.getMonthNum())); +// +// List budgetTargetVoList = new ArrayList<>(); +// +// +// //12个月 +// final int TOTAL_MONTH = 12; +// for (int y = startMonth.getYear(); y <= endMonth.getYear(); y++) { +// for (int m = 1; m <= TOTAL_MONTH; m++) { +// //防止多空白行 +// if(y == startMonth.getYear() && m < startMonth.getMonthValue()){ +// continue; +// } +// if(y == endMonth.getYear() && m > endMonth.getMonthValue()){ +// continue; +// } +// budgetTargetVoList.add(getBudgetTargetVo(listMap,listSupplierMap, m, y)); +// } +// } +// return budgetTargetVoList; +// } private BirBudgetTargetVo getBudgetTargetVo(Map> listMap,Map> listSupplierMap, int month, int year) { List mList = listMap.get(year +"_"+ month); diff --git a/src/main/java/com/qs/serve/task/BirRateTask.java b/src/main/java/com/qs/serve/task/BirRateTask.java deleted file mode 100644 index 48c68298..00000000 --- a/src/main/java/com/qs/serve/task/BirRateTask.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.qs.serve.task; - -import com.qs.serve.common.util.AuthContextUtils; -import com.qs.serve.modules.bir.mapper.BirReportAccountBookMapper; -import com.qs.serve.modules.bir.service.BirBudgetTargetImportService; -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 2023/7/14 - */ -@Slf4j -@Component -@AllArgsConstructor -@ConditionalOnProperty(value = "project.task", havingValue = "true") -public class BirRateTask { - - private final BirBudgetTargetImportService birBudgetTargetImportService; - - @Scheduled(cron="0 0 1 * * ?") - public void buildTempTable(){ - - } - -} diff --git a/src/main/resources/mapper/bir/BirBudgetTargetMapper.xml b/src/main/resources/mapper/bir/BirBudgetTargetMapper.xml index cc8132ae..bff9a103 100644 --- a/src/main/resources/mapper/bir/BirBudgetTargetMapper.xml +++ b/src/main/resources/mapper/bir/BirBudgetTargetMapper.xml @@ -51,13 +51,6 @@ SELECT FROM bir_budget_target and bir_budget_target.search_type = #{query.loadType} - - - - - - - AND ( (year_num >= #{query.yearStart}) OR (year_num = #{query.yearStart} AND month_num >= #{query.monthStart})