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

修BUG，BIR为空报错，销售区域查询，USER的OA帐号为空 

优化默认成本中心查询
contract
15989082884@163.com 2 years ago
parent
5a8bd20d66
commit
bdb221a047
4 changed files with 88 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java
  2. 144
      src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java
  3. 2
      src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
  4. 8
      src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java

4
src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java
View File

@ -325,7 +325,9 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
} }
BigDecimal costSumAmt = baseMapper.querySumAmt(costDTO); BigDecimal costSumAmt = baseMapper.querySumAmt(costDTO);
percent = costSumAmt.divide(dispatchSumAmt,4, RoundingMode.HALF_UP).floatValue(); if(costSumAmt!=null) {
percent = costSumAmt.divide(dispatchSumAmt, 4, RoundingMode.HALF_UP).floatValue();
}
return percent; return percent;
} }

144
src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java
View File

@ -105,10 +105,12 @@ public class BmsRegionController {
regionIds.addAll(supplier.listSaleRegionIds()); regionIds.addAll(supplier.listSaleRegionIds());
} }
List<HisUserSupplier> hisUserSuppliers = hisUserSupplierService.selectHisSupplier(null,false); List<HisUserSupplier> hisUserSuppliers = hisUserSupplierService.selectHisSupplier(null,false);
List<String> firstRegionIds = hisUserSuppliers.stream().map(a->a.getSaleRegionFirst()).collect(Collectors.toList()); List<Long> supplierIds = hisUserSuppliers.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList());
List<String> secondRegionIds = hisUserSuppliers.stream().map(a->a.getSaleRegionSecond()).collect(Collectors.toList()); List<BmsSupplier> supplierList = bmsSupplierService.listByIds(supplierIds);
List<String> thirdRegionIds = hisUserSuppliers.stream().map(a->a.getSaleRegionThird()).collect(Collectors.toList()); List<String> firstRegionIds = supplierList.stream().map(a->a.getRegionFirst()).collect(Collectors.toList());
List<String> fourthlyRegionIds = hisUserSuppliers.stream().map(a->a.getSaleRegionFourthly()).collect(Collectors.toList()); List<String> secondRegionIds = supplierList.stream().map(a->a.getRegionSecond()).collect(Collectors.toList());
List<String> thirdRegionIds = supplierList.stream().map(a->a.getRegionThird()).collect(Collectors.toList());
List<String> fourthlyRegionIds = supplierList.stream().map(a->a.getRegionFourthly()).collect(Collectors.toList());
regionIds.addAll(firstRegionIds); regionIds.addAll(firstRegionIds);
regionIds.addAll(secondRegionIds); regionIds.addAll(secondRegionIds);
regionIds.addAll(thirdRegionIds); regionIds.addAll(thirdRegionIds);
@ -122,70 +124,78 @@ public class BmsRegionController {
if(regionList.size()==0){ if(regionList.size()==0){
return toTreeNodeList2(allSelectList); return toTreeNodeList2(allSelectList);
} }
Map<Integer,List<BmsRegion>> listMap = regionList.stream().collect(Collectors.groupingBy(BmsRegion::getLevel));
List<BmsRegion> list1 = listMap.get(1)==null?new ArrayList<>():listMap.get(1);
List<BmsRegion> list2 = listMap.get(2)==null?new ArrayList<>():listMap.get(2);
List<BmsRegion> list3 = listMap.get(3)==null?new ArrayList<>():listMap.get(3);
List<BmsRegion> list4 = listMap.get(4)==null?new ArrayList<>():listMap.get(4);
//return allList替换allSelectList代表 返回含该节点下级的数据，当前使用allSelectList List<String> pathIds = regionList.stream().map(a->a.getPathIds()).collect(Collectors.toList());
List<BmsRegion> allList = new ArrayList<>(); List<String> idList = pathIds.stream()
if(CollectionUtil.isNotEmpty(list1)){ .flatMap(pathId -> Arrays.stream(pathId.split("_")))
allList.addAll(list1); .collect(Collectors.toList());
List<String> lv01Pids = list1.stream().map(BmsRegion::getId).collect(Collectors.toList()); regionList = bmsRegionService.listByIds(idList);
List<BmsRegion> level02List = bmsRegionService.listChild(lv01Pids); return toTreeNodeList2(regionList);
if(CollectionUtil.isNotEmpty(level02List)){ //
allList.addAll(level02List); // Map<Integer,List<BmsRegion>> listMap = regionList.stream().collect(Collectors.groupingBy(BmsRegion::getLevel));
//list2 去重 // List<BmsRegion> list1 = listMap.get(1)==null?new ArrayList<>():listMap.get(1);
list2 = removeExistList(list2, level02List); // List<BmsRegion> list2 = listMap.get(2)==null?new ArrayList<>():listMap.get(2);
List<String> lv02Pids = level02List.stream().map(BmsRegion::getId).collect(Collectors.toList()); // List<BmsRegion> list3 = listMap.get(3)==null?new ArrayList<>():listMap.get(3);
List<BmsRegion> level03List = bmsRegionService.listChild(lv02Pids); // List<BmsRegion> list4 = listMap.get(4)==null?new ArrayList<>():listMap.get(4);
if(CollectionUtil.isNotEmpty(level03List)){ //
allList.addAll(level03List); // //return allList替换allSelectList代表 返回含该节点下级的数据，当前使用allSelectList
//list3 去重 // List<BmsRegion> allList = new ArrayList<>();
list3 = removeExistList(list3,level03List); // if(CollectionUtil.isNotEmpty(list1)){
List<String> lv03Pids = level03List.stream().map(BmsRegion::getId).collect(Collectors.toList()); // allList.addAll(list1);
List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids); // List<String> lv01Pids = list1.stream().map(BmsRegion::getId).collect(Collectors.toList());
//list4 去重 // List<BmsRegion> level02List = bmsRegionService.listChild(lv01Pids);
list4 = removeExistList(list4,level04List); // if(CollectionUtil.isNotEmpty(level02List)){
allList.addAll(level04List); // allList.addAll(level02List);
} // //list2 去重
} // list2 = removeExistList(list2, level02List);
} // List<String> lv02Pids = level02List.stream().map(BmsRegion::getId).collect(Collectors.toList());
// List<BmsRegion> level03List = bmsRegionService.listChild(lv02Pids);
if(CollectionUtil.isNotEmpty(list2)){ // if(CollectionUtil.isNotEmpty(level03List)){
List<String> lv02Pids = list2.stream().map(BmsRegion::getId).collect(Collectors.toList()); // allList.addAll(level03List);
List<BmsRegion> level03List = bmsRegionService.listChild(lv02Pids); // //list3 去重
if(CollectionUtil.isNotEmpty(level03List)){ // list3 = removeExistList(list3,level03List);
allSelectList.addAll(level03List); // List<String> lv03Pids = level03List.stream().map(BmsRegion::getId).collect(Collectors.toList());
//list3 去重 // List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids);
list3 = removeExistList(list3,level03List); // //list4 去重
List<String> lv03Pids = level03List.stream().map(BmsRegion::getId).collect(Collectors.toList()); // list4 = removeExistList(list4,level04List);
List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids); // allList.addAll(level04List);
//list4 去重 // }
list4 = removeExistList(list4,level04List); // }
allSelectList.addAll(level04List); // }
} //
list2.forEach(a->a.setPid("0")); // if(CollectionUtil.isNotEmpty(list2)){
allSelectList.addAll(list2); // List<String> lv02Pids = list2.stream().map(BmsRegion::getId).collect(Collectors.toList());
} // List<BmsRegion> level03List = bmsRegionService.listChild(lv02Pids);
// if(CollectionUtil.isNotEmpty(level03List)){
if(CollectionUtil.isNotEmpty(list3)){ // allSelectList.addAll(level03List);
List<String> lv03Pids = list3.stream().map(BmsRegion::getId).collect(Collectors.toList()); // //list3 去重
List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids); // list3 = removeExistList(list3,level03List);
//list4 去重 // List<String> lv03Pids = level03List.stream().map(BmsRegion::getId).collect(Collectors.toList());
list4 = removeExistList(list4,level04List); // List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids);
allSelectList.addAll(level04List); // //list4 去重
list3.forEach(a->a.setPid("0")); // list4 = removeExistList(list4,level04List);
allSelectList.addAll(list3); // allSelectList.addAll(level04List);
} // }
// list2.forEach(a->a.setPid("0"));
if(CollectionUtil.isNotEmpty(list4)){ // allSelectList.addAll(list2);
//list4 去重 // }
list4.forEach(a->a.setPid("0")); //
allSelectList.addAll(list4); // if(CollectionUtil.isNotEmpty(list3)){
} // List<String> lv03Pids = list3.stream().map(BmsRegion::getId).collect(Collectors.toList());
return toTreeNodeList2(allSelectList); // List<BmsRegion> level04List = bmsRegionService.listChild(lv03Pids);
// //list4 去重
// list4 = removeExistList(list4,level04List);
// allSelectList.addAll(level04List);
// list3.forEach(a->a.setPid("0"));
// allSelectList.addAll(list3);
// }
//
// if(CollectionUtil.isNotEmpty(list4)){
// //list4 去重
// list4.forEach(a->a.setPid("0"));
// allSelectList.addAll(list4);
// }
// return toTreeNodeList2(allSelectList);
} }
return null; return null;

2
src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
View File

@ -223,7 +223,7 @@ public class SysUser implements Serializable {
} }
public boolean checkSyAccount(boolean throwEx){ public boolean checkSyAccount(boolean throwEx){
if(StringUtils.hasText(this.getSyAccount())&&StringUtils.hasText(this.getSyUserId())){ if(StringUtils.hasText(this.getSyUserId())){
return true; return true;
} }
if(throwEx){ if(throwEx){

8
src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
View File

@ -434,9 +434,15 @@ public class TbsActivityController {
} }
} }
} }
List<Long> budgetIds = budgetList.stream().map(a->a.getId()).collect(Collectors.toList());
LambdaQueryWrapper<TbsBudgetCondition> lqwCon = new LambdaQueryWrapper<>();
lqwCon.in(TbsBudgetCondition::getBudgetId,budgetIds);
List<TbsBudgetCondition> budgetConditionsAll = tbsBudgetConditionService.list(lqwCon);
Map<Long, List<TbsBudgetCondition>> groupedConditions = budgetConditionsAll.stream()
.collect(Collectors.groupingBy(TbsBudgetCondition::getBudgetId));
for (TbsBudget budget : budgetList) { for (TbsBudget budget : budgetList) {
if(budget.getConditionFlag().equals(1)){ if(budget.getConditionFlag().equals(1)){
List<TbsBudgetCondition> budgetConditions = tbsBudgetConditionService.getByBudgetId(budget.getId()); List<TbsBudgetCondition> budgetConditions = groupedConditions.get(budget.getId());
for (int i = 0; i < idPaths.size(); i++) { for (int i = 0; i < idPaths.size(); i++) {
String idPath = idPaths.get(i); String idPath = idPaths.get(i);
boolean isMatch = false; boolean isMatch = false;

Write Preview
Loading…
Cancel
Save