1.控制台bug调整

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

@@ -2828,6 +2828,7 @@
                 </if>
                 GROUP BY 	DATE_FORMAT( a.signing_time, '%Y-%m' )
             )  c  on c.subSigndate=a.subSigndate
+            order by    a.subSigndate
     </select>
 
     <select id="queryDateByTypeMonthSumAmount" resultType="java.math.BigDecimal">

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

@@ -1200,9 +1200,9 @@
         COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) AS underwritingCount,
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) AS qutationInsureCount,
         COUNT( CASE WHEN iac.orderstatus = 4 THEN 1 END ) AS underwritingReturn,
-        COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END )  /  COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) as "passingRate",
+        (COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) +COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ))  /  COUNT(iac.orderstatus)  as "passingRate",
         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( CASE WHEN iac.orderstatus = 2 THEN 1 END ))  /  COUNT(iac.orderstatus)  as  "contributionRate",
+        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"
         FROM
@@ -1319,8 +1319,8 @@
             iac.inscompany as  "insuranceCompanyName",
             COUNT( CASE WHEN ifa.auditstatus = 1 THEN 1 END ) AS "auditstatusOrders",
             COUNT( CASE WHEN ifa.auditstatus = 0 THEN 1 END ) AS "auditOrder",
-            COUNT( CASE WHEN pa.audit_type = 1 AND ifa.auditstatus = 1 THEN 1 END ) AS "persionAudit",
-            COUNT( CASE WHEN pa.audit_type = 2 AND ifa.auditstatus = 1 THEN 1 END ) AS "automaticAudit"
+            COUNT( CASE WHEN ifa.auditstatus = 1 and   ifa.audituser != '自动审核' THEN 1 END ) AS "persionAudit",
+            COUNT( CASE WHEN ifa.audituser = '自动审核'  THEN 1 END ) AS "automaticAudit"
         FROM
             ins_fee_audit ifa
             LEFT JOIN ins_orders io ON io.orderno = ifa.orderno