Explorar o código

修改bug:
私有应收 跟单结算报表-保险公司报表加个对账金额

jiakai hai 2 meses
pai
achega
9791af0026

+ 3 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/FollowCompanyFeeVO.java

@@ -51,6 +51,9 @@ public class FollowCompanyFeeVO {
     /** 累计应收  totalReceivable */
     private BigDecimal totalReceivable;
 
+    /** 对账金额  totalReceivable */
+    private BigDecimal totalReconciliationAmount;
+
     /**
      * 开票记录id
      */

+ 5 - 4
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -838,14 +838,15 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
             // 应收金额(取第一条)
             InsFeeFollowOrder firstFollow = followOrderMap.get(followIds.get(0));
-//            BigDecimal receivablePremium = Optional.ofNullable(firstFollow)
-//                    .map(InsFeeFollowOrder::getReceivablePremium)
-//                    .orElse(BigDecimal.ZERO);
+            BigDecimal receivablePremium = Optional.ofNullable(firstFollow)
+                    .map(InsFeeFollowOrder::getReceivablePremium)
+                    .orElse(BigDecimal.ZERO);
             // 对账金额
             BigDecimal reconciliationAmount = Optional.ofNullable(firstFollow)
                     .map(InsFeeFollowOrder::getReconciliationAmount)
                     .orElse(BigDecimal.ZERO);
-            vo.setTotalReceivable(reconciliationAmount);
+            vo.setTotalReceivable(receivablePremium);
+            vo.setTotalReconciliationAmount(reconciliationAmount);
 
             // 已开票总额
             BigDecimal totalInvoiced = followIds.stream()