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

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

@@ -177,4 +177,10 @@ public class TaskStatisticsDto {
     @ApiModelProperty(value = "机构来源")
     private String managementSource;
 
+
+    @ApiModelProperty(value = "代课录单数")
+    private String sumEntryStatus;
+
+
+
 }

src/main/resources/mapper/modules/admin/TaskStatisticsMapper.xml

@@ -100,7 +100,7 @@
                 and sd.id like concat('%',#{vo.deptId},'%')
             </if>
         </where>
-        order by  a.sumpremium  desc
+        order by  a.sumpremium  desc ,su.id
 
     </select>
 

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

@@ -1076,6 +1076,7 @@
         COUNT( CASE WHEN iot.order_status  = '0' THEN 1 END ) / COUNT(CASE WHEN  iot.order_status in ('0','1','2','3','4') THEN 1 END  ) AS "quotationRate",
         COUNT(CASE WHEN io.order_source = 0  and iot.order_status ='0' THEN 1 END) as "pcOrderSource",
         COUNT(CASE WHEN io.order_source = 1  and iot.order_status ='0' THEN 1 END) as "appOrderSource",
+        COUNT(CASE WHEN iac.entry_status = '2'  THEN 1 END) as "sumEntryStatus",
         COUNT( CASE WHEN iot.order_status = '1' THEN 1 END ) AS "auditOrder"
         FROM
         (