Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/model/dto/TaskStatisticsDto.java

@@ -170,4 +170,8 @@ public class TaskStatisticsDto {
     @ApiModelProperty(value = "时间差")
     private String timeDifference;
 
+
+    @ApiModelProperty(value = "总保司")
+    private String insuranceCompanyNumber;
+
 }

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

@@ -2342,13 +2342,15 @@
 
     <select id="getCountBusinessData" resultType="com.ydtech.modules.admin.model.dto.TaskStatisticsDto">
         select
-            a.totalPremium as "totalPremium",
-            a.qutationInsureCount as "qutationInsureCount",
-            ROUND(a.averagePremium, 2)  as "averagePremium",
-            a.userNumber as "userNumber",
-            ROUND(a.perCapitaAmount, 2) as "perCapitaAmount"
+            sum(a.totalPremium) as "totalPremium",
+            sum(a.qutationInsureCount) as "qutationInsureCount",
+            sum(ROUND(a.averagePremium, 2))  as "averagePremium",
+            sum(a.userNumber) as "userNumber",
+            count(DISTINCT a.insuranceCompanyName) as "insuranceCompanyNumber",
+            sum(ROUND(a.perCapitaAmount, 2)) as "perCapitaAmount"
         from  (
         SELECT
+        agree.insurance_company AS "insuranceCompanyName",
         IFNULL(sum(iac.jqpremium),0) + IFNULL(sum(iac.sypremium),0) +IFNULL(sum(iac.jypremium),0) as "totalPremium",
         COUNT(0 ) AS "qutationInsureCount",
         (IFNULL(sum(iac.jqpremium),0) + IFNULL(sum(iac.sypremium),0) +IFNULL(sum(iac.jypremium),0)) / COUNT(0 )  AS "averagePremium",
@@ -2395,6 +2397,8 @@
                 #{item}
             </foreach>
         </if>
+        group  by
+        agree.insurance_company
         )  a
 
     </select>