feat: 房源

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -219,7 +219,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         if (!CollectionUtils.isEmpty(gyIds)) {
             List<BusinessEntitySell> businessEntitySells = businessEntitySellMapper.selectBusinessEntitySellByEntityIds(gyIds);
             if (!CollectionUtils.isEmpty(businessEntitySells)) {
-                businessEntityStatisticsDetail.setGyCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).reduce(BigDecimal.ZERO, BigDecimal::add));
+                businessEntityStatisticsDetail.setGyCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
             }
         }
 
@@ -227,7 +227,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         if (!CollectionUtils.isEmpty(jzyIds)) {
             List<BusinessEntitySell> businessEntitySells = businessEntitySellMapper.selectBusinessEntitySellByEntityIds(jzyIds);
             if (!CollectionUtils.isEmpty(businessEntitySells)) {
-                businessEntityStatisticsDetail.setJzyCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).reduce(BigDecimal.ZERO, BigDecimal::add));
+                businessEntityStatisticsDetail.setJzyCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
             }
         }
 
@@ -235,7 +235,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         if (!CollectionUtils.isEmpty(pfIds)) {
             List<BusinessEntitySell> businessEntitySells = businessEntitySellMapper.selectBusinessEntitySellByEntityIds(pfIds);
             if (!CollectionUtils.isEmpty(businessEntitySells)) {
-                businessEntityStatisticsDetail.setPfCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).reduce(BigDecimal.ZERO, BigDecimal::add));
+                businessEntityStatisticsDetail.setPfCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
             }
         }
 
@@ -243,7 +243,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         if (!CollectionUtils.isEmpty(lsIds)) {
             List<BusinessEntitySell> businessEntitySells = businessEntitySellMapper.selectBusinessEntitySellByEntityIds(lsIds);
             if (!CollectionUtils.isEmpty(businessEntitySells)) {
-                businessEntityStatisticsDetail.setLsCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).reduce(BigDecimal.ZERO, BigDecimal::add));
+                businessEntityStatisticsDetail.setLsCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
             }
         }
 
@@ -251,7 +251,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         if (!CollectionUtils.isEmpty(zsIds)) {
             List<BusinessEntitySell> businessEntitySells = businessEntitySellMapper.selectBusinessEntitySellByEntityIds(zsIds);
             if (!CollectionUtils.isEmpty(businessEntitySells)) {
-                businessEntityStatisticsDetail.setZsCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).reduce(BigDecimal.ZERO, BigDecimal::add));
+                businessEntityStatisticsDetail.setZsCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
             }
         }
 
@@ -259,7 +259,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         if (!CollectionUtils.isEmpty(cyIds)) {
             List<BusinessEntitySell> businessEntitySells = businessEntitySellMapper.selectBusinessEntitySellByEntityIds(cyIds);
             if (!CollectionUtils.isEmpty(businessEntitySells)) {
-                businessEntityStatisticsDetail.setCyCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).reduce(BigDecimal.ZERO, BigDecimal::add));
+                businessEntityStatisticsDetail.setCyCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
             }
         }
 
@@ -267,7 +267,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         if (!CollectionUtils.isEmpty(fwyIds)) {
             List<BusinessEntitySell> businessEntitySells = businessEntitySellMapper.selectBusinessEntitySellByEntityIds(fwyIds);
             if (!CollectionUtils.isEmpty(businessEntitySells)) {
-                businessEntityStatisticsDetail.setFwyCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).reduce(BigDecimal.ZERO, BigDecimal::add));
+                businessEntityStatisticsDetail.setFwyCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
             }
         }
 
@@ -275,7 +275,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         if (!CollectionUtils.isEmpty(qtIds)) {
             List<BusinessEntitySell> businessEntitySells = businessEntitySellMapper.selectBusinessEntitySellByEntityIds(qtIds);
             if (!CollectionUtils.isEmpty(businessEntitySells)) {
-                businessEntityStatisticsDetail.setQtjjfzCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).reduce(BigDecimal.ZERO, BigDecimal::add));
+                businessEntityStatisticsDetail.setQtjjfzCount(businessEntitySells.stream().map(BusinessEntitySell::getYearSell).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
             }
         }
         return businessEntityStatisticsDetail;