jcyen
/
jsl-questionnaire-base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

弃用bir_budget_tartger表

checkBack
15989082884@163.com 1 year ago
parent
bd0279ab11
commit
c235bd9ea2
5 changed files with 72 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java
  2. 2
      src/main/java/com/qs/serve/modules/bir/service/BirBudgetTargetService.java
  3. 122
      src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetServiceImpl.java
  4. 29
      src/main/java/com/qs/serve/task/BirRateTask.java
  5. 7
      src/main/resources/mapper/bir/BirBudgetTargetMapper.xml

20
src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java
View File

@ -146,16 +146,16 @@ public class BirRoiRateController {
* @param query
* @return
*/
@RepeatSubmit
@PostMapping("/costYearMonthV2")
public R<List<BirBudgetTargetVo>> getCostRoiOfYearMonthV2(@RequestBody BirBudgetTargetSo query){
boolean isRestBir = BirHttpUtil.isRestBir();
if(isRestBir){
return BirHttpUtil.post("/bir/roiRate/costYearMonthV2",query);
}
List<BirBudgetTargetVo> list = birBudgetTargetService.listVo(query);
return R.ok(list);
}
// @RepeatSubmit
// @PostMapping("/costYearMonthV2")
// public R<List<BirBudgetTargetVo>> getCostRoiOfYearMonthV2(@RequestBody BirBudgetTargetSo query){
// boolean isRestBir = BirHttpUtil.isRestBir();
// if(isRestBir){
// return BirHttpUtil.post("/bir/roiRate/costYearMonthV2",query);
// }
// List<BirBudgetTargetVo> list = birBudgetTargetService.listVo(query);
// return R.ok(list);
// }
/**
* 获取费率

2
src/main/java/com/qs/serve/modules/bir/service/BirBudgetTargetService.java
View File

@ -15,7 +15,7 @@ import java.util.List;
*/
public interface BirBudgetTargetService extends IService<BirBudgetTarget> {
List<BirBudgetTargetVo> listVo(BirBudgetTargetSo query);
// List<BirBudgetTargetVo> listVo(BirBudgetTargetSo query);
List<BirBaseReportVo> listBaseVo(BirBudgetTargetSo query);

122
src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetServiceImpl.java
View File

@ -226,67 +226,67 @@ public class BirBudgetTargetServiceImpl extends ServiceImpl<BirBudgetTargetMappe
return vo;
}
@Override
public List<BirBudgetTargetVo> 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<BirBudgetTarget> birBudgetTargets = baseMapper.selectBirBudgetTargetList(query);
query.setLoadType(0);
List<BirBudgetTarget> birSupplierBudgetTargets = baseMapper.selectBirBudgetTargetList(query);
Map<String,List<BirBudgetTarget>> listMap = birBudgetTargets.stream()
.collect(Collectors.groupingBy(obj->obj.getYearNum()+"_"+obj.getMonthNum()));
Map<String,List<BirBudgetTarget>> listSupplierMap = birSupplierBudgetTargets.stream()
.collect(Collectors.groupingBy(obj->obj.getYearNum()+"_"+obj.getMonthNum()));
List<BirBudgetTargetVo> 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<BirBudgetTargetVo> 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<BirBudgetTarget> birBudgetTargets = baseMapper.selectBirBudgetTargetList(query);
//
// query.setLoadType(0);
// List<BirBudgetTarget> birSupplierBudgetTargets = baseMapper.selectBirBudgetTargetList(query);
//
// Map<String,List<BirBudgetTarget>> listMap = birBudgetTargets.stream()
// .collect(Collectors.groupingBy(obj->obj.getYearNum()+"_"+obj.getMonthNum()));
// Map<String,List<BirBudgetTarget>> listSupplierMap = birSupplierBudgetTargets.stream()
// .collect(Collectors.groupingBy(obj->obj.getYearNum()+"_"+obj.getMonthNum()));
//
// List<BirBudgetTargetVo> 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<String, List<BirBudgetTarget>> listMap,Map<String, List<BirBudgetTarget>> listSupplierMap, int month, int year) {
List<BirBudgetTarget> mList = listMap.get(year +"_"+ month);

29
src/main/java/com/qs/serve/task/BirRateTask.java
View File

@ -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(){
}
}

7
src/main/resources/mapper/bir/BirBudgetTargetMapper.xml
View File

@ -51,13 +51,6 @@
SELECT <include refid="birBudgetTargetSql"/> FROM bir_budget_target
<where>
<if test="query.loadType != null"> and bir_budget_target.search_type = #{query.loadType}</if>
<!-- <if test="query.yearMonthStart != null"> and bir_budget_target.row_date &gt;= #{query.yearMonthStart}</if>-->
<!-- <if test="query.yearMonthEnd != null"> and bir_budget_target.row_date &lt;= #{query.yearMonthEnd}</if>-->
<!-- <if test="query.yearStart != null"> and bir_budget_target.year_num &gt;= #{query.yearStart}</if>-->
<!-- <if test="query.yearEnd != null"> and bir_budget_target.year_num &lt;= #{query.yearEnd}</if>-->
<!-- <if test="query.monthStart != null"> and bir_budget_target.month_num &gt;= #{query.monthStart}</if>-->
<!-- <if test="query.monthEnd != null"> and bir_budget_target.month_num &lt;= #{query.monthEnd}</if>-->
<if test="query.yearStart != null and query.yearEnd != null and query.monthStart != null and query.monthEnd != null">
AND (
(year_num &gt;= #{query.yearStart}) OR (year_num = #{query.yearStart} AND month_num &gt;= #{query.monthStart})

Write Preview
Loading…
Cancel
Save