1.控制台bug优化

src/main/java/com/ydtech/modules/admin/service/impl/CompanyDataReportServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -77,7 +78,9 @@ public class CompanyDataReportServiceImpl implements CompanyDataReportService {
                 BigDecimal allNumber = this.calculateTotal(areaCompanyErrNumber, orderSuccessNumber, null);
                 item.setAllNumber(allNumber);
                 item.setAreaCompanyErrNumber(areaCompanyErrNumber);
-                item.setOrderSuccessNumberRate(item.getOrderSuccessNumber().divide(item.getAllNumber()));
+                int scale = 2;
+                RoundingMode roundingMode = RoundingMode.HALF_UP; // 四舍五入
+                item.setOrderSuccessNumberRate(item.getOrderSuccessNumber().divide(allNumber, scale, roundingMode));
             }
         }
         resultSubOrder.setTotal(total);

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -2822,6 +2822,9 @@
                     settlement_documentary_fees  a
                 where a.settlement_status='1'
                   and handling_fees_status ='1'
+                <if test="vo.isNotCar !=null  and  vo.isNotCar  !=''">
+                    and a.is_not_car =#{vo.isNotCar}
+                </if>
                 GROUP BY 	DATE_FORMAT( a.signing_time, '%Y-%m' )
             )  c  on c.subSigndate=a.subSigndate
     </select>

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -1115,7 +1115,7 @@
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) / COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) AS "closeRate",
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) / COUNT( iac.orderstatus ) AS "contributionRate",
         COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) / COUNT( iac.orderstatus ) AS "quotationRate",
-        COUNT( CASE WHEN iac.orderstatus = 1 THEN 1 END ) AS "auditOrder"
+        COUNT( CASE WHEN ifa.auditstatus = 0 THEN 1 END ) AS "auditOrder"
         FROM
         ins_area_company iac
         LEFT JOIN ins_fee_audit ifa ON ifa.ins_order_no = iac.id
@@ -1396,11 +1396,12 @@
         SELECT
         count( a.numberUserId ) as "orderManpower",
         IFNULL(sum( a.orderAmount ),0) as "totalPremium",
-        ROUND(sum( a.orderAmount )/ count( a.numberUserId ),2) AS "averagePremium"
+        ROUND(sum( a.orderAmount )/ sum(a.ordernoNumber),2) AS "averagePremium"
         FROM
         (
         SELECT
         count( io.userid ) AS "numberUserId",
+        count( iac.orderno ) AS "ordernoNumber",
         SUM(IFNULL(iac.jqpremium, 0)
         +IFNULL(iac.sypremium, 0)
         +IFNULL(iac.jypremium, 0)
@@ -1564,11 +1565,11 @@
         agree.insurance_company AS "insuranceCompanyName",
         agree.partner_companies_id AS "parterCompanyId",
         ins.namesimple AS "partnerCompaniesName",
-        sum(iac.sumpremium) as "totalPremium",
+        IFNULL(sum(iac.jqpremium),0) + IFNULL(sum(iac.sypremium),0) +IFNULL(sum(iac.jypremium),0) as "totalPremium",
         COUNT(0 ) AS "qutationInsureCount",
-        sum(iac.sumpremium) / COUNT(0 )  AS "averagePremium",
+        IFNULL(sum(iac.jqpremium),0) + IFNULL(sum(iac.sypremium),0) +IFNULL(sum(iac.jypremium),0) / COUNT(0 )  AS "averagePremium",
         COUNT(DISTINCT io.userId) AS "userNumber",
-        sum(iac.sumpremium) / COUNT(DISTINCT io.userId)  as "perCapitaAmount"
+        IFNULL(sum(iac.jqpremium),0) + IFNULL(sum(iac.sypremium),0) +IFNULL(sum(iac.jypremium),0) / COUNT(DISTINCT io.userId)  as "perCapitaAmount"
         FROM
         ins_area_company iac
         LEFT JOIN ptl_agreement agree ON iac.agreement_id = agree.id