From 336d113220f675976f864ad3eab7df7cd432808d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 01 五月 2026 08:35:43 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/smartor

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
index f134da8..7608a6a 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -118,6 +118,9 @@
     @Excel(name = " 棣栨闅忚澶辫触 ")
     private Long followUpFail = 0L;
 
+    @ApiModelProperty(value = "鏃犻渶闅忚璇︽儏")
+    private List<ServiceSubtask> nonFollowUpInfo;
+
     @ApiModelProperty(value = "棣栨搴旈殢璁胯鎯�")
     private List<ServiceSubtask> needFollowUpInfo;
 
@@ -132,6 +135,9 @@
 
     @ApiModelProperty(value = "棣栨闅忚浜哄伐璇︽儏")
     private List<ServiceSubtask> manualInfo;
+
+    @ApiModelProperty(value = "棣栨闅忚璇煶璇︽儏")
+    private List<ServiceSubtask> voiceInfo;
 
     @ApiModelProperty(value = "棣栨闅忚鐭俊璇︽儏")
     private List<ServiceSubtask> smsInfo;
@@ -154,6 +160,9 @@
     @ApiModelProperty(value = "鍐嶆闅忚浜哄伐璇︽儏")
     private List<ServiceSubtask> manualAgainInfo;
 
+    @ApiModelProperty(value = "鍐嶆闅忚璇煶璇︽儏")
+    private List<ServiceSubtask> voiceAgainInfo;
+
     @ApiModelProperty(value = "鍐嶆闅忚鐭俊璇︽儏")
     private List<ServiceSubtask> smsAgainInfo;
 
@@ -164,6 +173,10 @@
     @Excel(name = " 鍙婃椂鐜� ")
     private Double rate = 0.0;
 
+    @ApiModelProperty(value = "瀹屾垚鐜�")
+    @Excel(name = " 瀹屾垚鐜� ")
+    private Double finishRate = 0.0;
+
     @ApiModelProperty(value = "棣栨闅忚鐜�")
     @Excel(name = " 棣栨闅忚鐜� ")
     private String followUpRate;
@@ -171,6 +184,10 @@
     @ApiModelProperty(value = "棣栨浜哄伐")
     @Excel(name = " 棣栨浜哄伐 ")
     private Long manual = 0L;
+
+    @ApiModelProperty(value = "棣栨璇煶")
+    @Excel(name = " 棣栨璇煶 ")
+    private Long voice = 0L;
 
     @ApiModelProperty(value = "棣栨鐭俊")
     @Excel(name = " 棣栨鐭俊 ")
@@ -207,10 +224,13 @@
     @Excel(name = " 浜屾浜哄伐 ")
     private Long manualAgain = 0L;
 
+    @ApiModelProperty(value = "浜屾璇煶")
+    @Excel(name = " 浜屾璇煶 ")
+    private Long voiceAgain = 0L;
+
     @ApiModelProperty(value = "浜屾鐭俊")
     @Excel(name = " 浜屾鐭俊 ")
     private Long smsAgain = 0L;
-    @Excel(name = " 浜屾寰俊 ")
 
     @ApiModelProperty(value = "浜屾寰俊")
     private Long weChatAgain = 0L;

--
Gitblit v1.9.3