处理空指针

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/impl/BusinessFsSaleRevenueServiceImpl.java

@@ -125,10 +125,10 @@ public class BusinessFsSaleRevenueServiceImpl extends ServiceImpl<BusinessFsSale
         if (CollectionUtils.isNotEmpty(param.getThreeConsistenceList())) {
             param.getThreeConsistenceList().forEach(threeConsistence -> {
                 threeConsistence.setFsSaleRevenueId(param.getId());
-                threeConsistence.setProvinceAccountingQuantity(threeConsistence.getAccountingQuantity());
+                threeConsistence.setProvinceAccountingQuantity(threeConsistence.getAccountingQuantity() == null ? new BigDecimal(0) : threeConsistence.getAccountingQuantity());
                 threeConsistence.setAccountingUnitPrice(new BigDecimal(0));
                 threeConsistence.setProvinceAccountingUnitPrice(new BigDecimal(0));
-                threeConsistence.setProvinceAccountingAmount(threeConsistence.getAccountingAmount());
+                threeConsistence.setProvinceAccountingAmount(threeConsistence.getAccountingAmount() == null ? new BigDecimal(0) : threeConsistence.getAccountingAmount());
                 threeConsistenceMapper.insert(threeConsistence);
             });
         }
@@ -157,6 +157,7 @@ public class BusinessFsSaleRevenueServiceImpl extends ServiceImpl<BusinessFsSale
             });
         }
     }
+
     // 保存子表-原核定入库价格
     private void saveApprovalPrice(BusinessFsSaleRevenue param) {
         if (CollectionUtils.isNotEmpty(param.getApprovalPriceList())) {
@@ -166,6 +167,7 @@ public class BusinessFsSaleRevenueServiceImpl extends ServiceImpl<BusinessFsSale
             });
         }
     }
+
     // 保存子表-差价上缴
     private void saveDiffPrice(BusinessFsSaleRevenue param) {
         if (CollectionUtils.isNotEmpty(param.getDiffPriceList())) {

src/main/resources/mapper/priceApproval/BusinessFsSaleRevenueMapper.xml

@@ -259,8 +259,8 @@
     <select id="getDiffPriceInfo" parameterType="string" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueDiffPrice">
         SELECT
             dpi.project_type projectType,
-            dpi.quantity totalQuantity,
-            dpi.amount totalAmount
+            IFNULL(dpi.quantity,0) totalQuantity,
+	        IFNULL(dpi.amount,0) totalAmount
         FROM
             business_fs_out_confirm_diff_price_item dpi
         LEFT JOIN business_fs_out_confirm oc ON dpi.fs_out_confirm_id = oc.id