1.控制台添加外部订单统计

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

@@ -181,6 +181,9 @@ public class TaskStatisticsDto {
     @ApiModelProperty(value = "代课录单数")
     private String sumEntryStatus;
 
+    @ApiModelProperty(value = "外部录单")
+    private String outStatus;
+
 
 
 }

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

@@ -143,9 +143,12 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
                     }
                 }
                 taskStatisticsVo.setUserId(record.getUserId());
-                String sumEntryStatus = this.insAreaCompanyMapper.getSumEntryStatus(taskStatisticsVo);
-                if(StringUtils.isNotEmpty(sumEntryStatus)){
-                    record.setSumEntryStatus(sumEntryStatus);
+                HashMap<String,Object> sumEntryStatus = this.insAreaCompanyMapper.getSumEntryStatus(taskStatisticsVo);
+                if(!sumEntryStatus.isEmpty()){
+                    String entryStatus = sumEntryStatus.get("entryStatus").toString();
+                    String outStatus = sumEntryStatus.get("outStatus").toString();
+                    record.setSumEntryStatus(entryStatus);
+                    record.setOutStatus(outStatus);
                 }
                 taskStatisticsVo.setUserId(null);
             }

src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyMapper.java

@@ -419,7 +419,7 @@ public interface InsAreaCompanyMapper extends BaseMapper<InsAreaCompany> {
      * @param userId
      * @return  代课录单数
      */
-    String getSumEntryStatus(@Param("taskStatisticsVo") TaskStatisticsVo taskStatisticsVo);
+    HashMap<String,Object> getSumEntryStatus(@Param("taskStatisticsVo") TaskStatisticsVo taskStatisticsVo);
 }
 
 

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

@@ -3607,13 +3607,13 @@
         order by  iac.createtime
     </select>
 
-    <select id="getSumEntryStatus" resultType="java.lang.String">
-            select count(0)
+    <select id="getSumEntryStatus" resultType="java.util.HashMap">
+            select ifnull( COUNT( CASE WHEN iac.entry_status = '2' THEN 1 END ),0) as "entryStatus",
+                   ifnull(COUNT( CASE WHEN iac.entry_status = '3' THEN 1 END ),0) as "outStatus"
             from ins_area_company   iac
             left join  ins_orders io  on  iac.orderno  =io.orderno
             <where>
-                iac.entry_status ='2'
-                and iac.orderstatus ='3'
+                 iac.orderstatus ='3'
                 <if test="taskStatisticsVo.userId !=null  and  taskStatisticsVo.userId != ''">
                    and io.userid =#{taskStatisticsVo.userId}
                 </if>