Browse Source

subList空指针

contract
Yen 2 years ago
parent
commit
be7360b89a
  1. 5
      src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java
  2. 7
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

5
src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java

@ -115,7 +115,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
//发货单 //发货单
List<ErpDispatchSumVo> dispatchSumVos = null; List<ErpDispatchSumVo> dispatchSumVos = null;
if(supplierCodeList.size()>0){ if(supplierCodeList!=null&&supplierCodeList.size()>0){
dispatchSumVos = dispatchDataMapper.querySumCost(startMonthNum,currMonthNum,supplierCodeList); dispatchSumVos = dispatchDataMapper.querySumCost(startMonthNum,currMonthNum,supplierCodeList);
} }
for (BirRoiCostItemVo costItemVo : costItemVoList) { for (BirRoiCostItemVo costItemVo : costItemVoList) {
@ -313,6 +313,9 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
private Float getPercenDateByLoadType(Integer loadType,BirRoiCostDTO oriCostDTO,String supplierId,String userId){ private Float getPercenDateByLoadType(Integer loadType,BirRoiCostDTO oriCostDTO,String supplierId,String userId){
BirRoiCostDTO costDTO = CopierUtil.copy(oriCostDTO,new BirRoiCostDTO()); BirRoiCostDTO costDTO = CopierUtil.copy(oriCostDTO,new BirRoiCostDTO());
List<String> supplierCodeList = getBiRoiCostDTOAndFindSupplierCodes(costDTO, supplierId, loadType, userId); List<String> supplierCodeList = getBiRoiCostDTOAndFindSupplierCodes(costDTO, supplierId, loadType, userId);
if(supplierCodeList==null||supplierCodeList.size()==0){
return 0F;
}
Float tempPercent = getPercentDate(costDTO,supplierCodeList); Float tempPercent = getPercentDate(costDTO,supplierCodeList);
return tempPercent; return tempPercent;
} }

7
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@ -446,13 +446,16 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
Map<String,List<ErpDispatchSumVo>> supplierCodeMapWithCenterType = new HashMap<>(); Map<String,List<ErpDispatchSumVo>> supplierCodeMapWithCenterType = new HashMap<>();
Map<String,List<TbsActivityCenter>> centerMapList = tbsActivityCenters.stream().collect(Collectors.groupingBy(TbsActivityCenter::getCenterType)); Map<String,List<TbsActivityCenter>> centerMapList = tbsActivityCenters.stream().collect(Collectors.groupingBy(TbsActivityCenter::getCenterType));
for (String centerType : centerMapList.keySet()) { for (String centerType : centerMapList.keySet()) {
List<String> centerIds =centerMapList.get(centerType).stream().map(a->a.getCenterId()).collect(Collectors.toList()); List<String> centerIds =centerMapList.get(centerType).stream().map(TbsActivityCenter::getCenterId).collect(Collectors.toList());
List<String> supplierCodeList = roiRateService.getSupplierCodesByCenter(costDTO,centerType,centerIds); List<String> supplierCodeList = roiRateService.getSupplierCodesByCenter(costDTO,centerType,centerIds);
//发货单 //发货单
List<ErpDispatchSumVo> dispatchSumVos = null; List<ErpDispatchSumVo> dispatchSumVos = null;
if(supplierCodeList.size()>0){ if(supplierCodeList!=null&&supplierCodeList.size()>0){
dispatchSumVos = dispatchDataMapper.querySumCost(startMonthNum,endMonthNum,supplierCodeList); dispatchSumVos = dispatchDataMapper.querySumCost(startMonthNum,endMonthNum,supplierCodeList);
supplierCodeMapWithCenterType.put(centerType,dispatchSumVos); supplierCodeMapWithCenterType.put(centerType,dispatchSumVos);
}else {
//防止后面获取空指针
supplierCodeMapWithCenterType.put(centerType,new ArrayList<>());
} }
} }

Loading…
Cancel
Save