1.资产实收款推荐

2.修复订单数量为0，出单率计算空指针异常的情况

dao/src/main/resources/mapper/AssetsProductionMapper.xml

@@ -225,7 +225,8 @@
         eDeclare.declare_result AS eDeclareResult,
         mDeclare.declare_result AS mDeclareResult,
         (SELECT user.name FROM user WHERE user.id = assets.client_manager_id) AS marketUser,
-        (SELECT user.name FROM user WHERE user.id = assets.principal_id) AS evaluateUser
+        (SELECT user.name FROM user WHERE user.id = assets.principal_id) AS evaluateUser,
+        fi.invoiceAmount
         FROM (SELECT @i := 0) AS sort,assets
         LEFT JOIN assets_production AS production ON production.business_id = assets.id
         LEFT JOIN order_fund AS oFund ON oFund.business_id = assets.id AND oFund.order_id = assets.order_id
@@ -243,6 +244,8 @@
         WHERE `declare`.business_type = 'COMMISSION_DECLARE_ASSET_MARKET'
         AND deleted = 0
         ) AS mDeclare ON mDeclare.business_id = assets.id AND mDeclare.production_id = production.id
+        left join (select id,business_id,real_amount,should_amount from order_fund where business_type='ASSET_BUSINESS' and deleted = 0) o on o.business_id = assets.id
+        left join (select sum(real_amount) as invoiceAmount,order_fund_id from finance_invoice where state ='已开票' and deleted = 0 GROUP BY order_fund_id) fi on fi.order_fund_id = o.id
         WHERE production.production_type != 'STATEMENT'
         AND assets.client_manager_id = #{managerId}
         AND production.create_production_date IS NOT NULL

domain/src/main/java/com/dayou/vo/AssetsProductionFundVo.java

@@ -99,4 +99,9 @@ public class AssetsProductionFundVo {
      * 评估人员
      */
     private String evaluateUser;
+
+    /**
+     * 开票金额
+     */
+    private BigDecimal invoiceAmount;
 }

service/src/main/java/com/dayou/service/impl/MajorStatisticalStatementServiceImpl.java

@@ -135,7 +135,7 @@ public class MajorStatisticalStatementServiceImpl implements IMajorStatisticalSt
         for (MajorEvaluateEfficiencyVO efficiencyVO : efficiencyVOList) {
 
             // 计算当期出单率
-            if (efficiencyVO.getCurrentPeriodReportVolume() > 0) { // 当期出报告书大于0
+            if (efficiencyVO.getCurrentPeriodReportVolume() > 0 && (efficiencyVO.getInformalEvaluateCount() > 0 || efficiencyVO.getUnInformalEvaluateCount() > 0)) { // 当期出报告书大于0
                 efficiencyVO.setCurrentPeriodOrderHasReportVolume((efficiencyVO.getCurrentPeriodReportVolume().doubleValue() / (efficiencyVO.getInformalEvaluateCount() + efficiencyVO.getUnInformalEvaluateCount())));
             } else {
                 efficiencyVO.setCurrentPeriodOrderHasReportVolume(0.0);
@@ -223,7 +223,7 @@ public class MajorStatisticalStatementServiceImpl implements IMajorStatisticalSt
         for (MajorEvaluateEfficiencyVO efficiencyVO : efficiencyVOList) {
 
             // 计算当期出单率
-            if (efficiencyVO.getCurrentPeriodReportVolume() > 0) { // 当期出报告书大于0
+            if (efficiencyVO.getCurrentPeriodReportVolume() > 0 && (efficiencyVO.getInformalEvaluateCount() > 0 || efficiencyVO.getUnInformalEvaluateCount() > 0)) { // 当期出报告书大于0
                 efficiencyVO.setCurrentPeriodOrderHasReportVolume((efficiencyVO.getCurrentPeriodReportVolume().doubleValue() / (efficiencyVO.getInformalEvaluateCount() + efficiencyVO.getUnInformalEvaluateCount())));
             } else {
                 efficiencyVO.setCurrentPeriodOrderHasReportVolume(0.0);