达沃特大屏修改

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderItemsServiceImpl.java

@@ -376,14 +376,14 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 		if (CollectionUtils.isNotEmpty(corpsType) && CollectionUtils.isNotEmpty(orderDateVoList)){
 			for (CorpsDesc corpsDesc : corpsType) {
 				OrderDateVo orderDateVo = new OrderDateVo();
-				orderDateVo.setBelongToCorpName(corpsDesc.getCname());
+				orderDateVo.setBelongToCorpName(corpsDesc.getGoodtypes());
 				orderDateVo.setOrderNumber(orderDateVoList.stream().filter(e -> e.getBelongToCorpId().longValue()==corpsDesc.getId().longValue()).map(OrderDateVo::getOrderNumber).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(0,BigDecimal.ROUND_HALF_UP));
 				list.add(orderDateVo);
 			}
 		}else if (CollectionUtils.isNotEmpty(corpsType) && CollectionUtils.isEmpty(orderDateVoList)){
 			for (CorpsDesc corpsDesc : corpsType) {
 				OrderDateVo orderDateVo = new OrderDateVo();
-				orderDateVo.setBelongToCorpName(corpsDesc.getCname());
+				orderDateVo.setBelongToCorpName(corpsDesc.getGoodtypes());
 				orderDateVo.setOrderNumber(BigDecimal.ZERO);
 				list.add(orderDateVo);
 			}
@@ -406,7 +406,7 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 			BigDecimal decimal = orderDateVoList.stream().map(OrderDateVo::getOrderNumber).reduce(BigDecimal.ZERO, BigDecimal::add);
 			for (CorpsDesc corpsDesc : corpsType) {
 				BrandSalesVo brandSalesVo = new BrandSalesVo();
-				brandSalesVo.setBelongToCorpName(corpsDesc.getCname());
+				brandSalesVo.setBelongToCorpName(corpsDesc.getGoodtypes());
 				if (decimal.compareTo(BigDecimal.ZERO) >0 ){
 					brandSalesVo.setOrderNumber(orderDateVoList.stream().filter(e -> e.getBelongToCorpId().longValue()==corpsDesc.getId().longValue())
 						.map(OrderDateVo::getOrderNumber).reduce(BigDecimal.ZERO, BigDecimal::add).divide(decimal, 5, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0,BigDecimal.ROUND_HALF_UP));
@@ -418,7 +418,7 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 		}else if (CollectionUtils.isNotEmpty(corpsType) && CollectionUtils.isEmpty(orderDateVoList)){
 			for (CorpsDesc corpsDesc : corpsType) {
 				BrandSalesVo brandSalesVo = new BrandSalesVo();
-				brandSalesVo.setBelongToCorpName(corpsDesc.getCname());
+				brandSalesVo.setBelongToCorpName(corpsDesc.getGoodtypes());
 				brandSalesVo.setOrderNumber(BigDecimal.ZERO);
 				list.add(brandSalesVo);
 			}