From 29e7d214720287fb86141524dd4a814f09887df4 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 18 九月 2026 16:40:38 +0800
Subject: [PATCH] 【市一】统计加上成功和总数

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java |  138 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 137 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 3d6597e..7220e46 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -102,6 +102,9 @@
     @Excel(name = " 搴旈殢璁夸汉娆� ")
     private Long followUpNeeded = 0L;
 
+    @ApiModelProperty(value = "棣栨鏃犻渶闅忚")
+    private Long nonFollowUpFirst = 0L;
+
     @ApiModelProperty(value = "棣栨搴旈殢璁�")
     @Excel(name = " 棣栨搴旈殢璁� ")
     private Long needFollowUp = 0L;
@@ -118,9 +121,88 @@
     @Excel(name = " 棣栨闅忚澶辫触 ")
     private Long followUpFail = 0L;
 
+    @ApiModelProperty(value = "鍑洪櫌浜烘璇︽儏")
+    private List<ServiceSubtask> dischargeCountInfo;
+
+    @ApiModelProperty(value = "鏃犻渶闅忚璇︽儏")
+    private List<ServiceSubtask> nonFollowUpInfo;
+
+    @ApiModelProperty(value = "搴旈殢璁胯鎯�")
+    private List<ServiceSubtask> followUpNeededAllInfo;
+
+    @ApiModelProperty(value = "棣栨搴旈殢璁胯鎯�")
+    private List<ServiceSubtask> needFollowUpInfo;
+
+    @ApiModelProperty(value = "棣栨寰呴殢璁胯鎯�")
+    private List<ServiceSubtask> pendingFollowUpInfo;
+
+    @ApiModelProperty(value = "棣栨闅忚鎴愬姛璇︽儏")
+    private List<ServiceSubtask> followUpSuccessInfo;
+
+    @ApiModelProperty(value = "棣栨闅忚澶辫触璇︽儏")
+    private List<ServiceSubtask> followUpFailInfo;
+
+    @ApiModelProperty(value = "棣栨闅忚浜哄伐璇︽儏")
+    private List<ServiceSubtask> manualInfo;
+
+    @ApiModelProperty(value = "棣栨闅忚璇煶璇︽儏")
+    private List<ServiceSubtask> voiceInfo;
+
+    @ApiModelProperty(value = "棣栨闅忚鐭俊璇︽儏")
+    private List<ServiceSubtask> smsInfo;
+
+    @ApiModelProperty(value = "棣栨闅忚寰俊璇︽儏")
+    private List<ServiceSubtask> wechatInfo;
+
+    @ApiModelProperty(value = "鍐嶆搴旈殢璁胯鎯�")
+    private List<ServiceSubtask> needFollowUpAgainInfo;
+
+    @ApiModelProperty(value = "鍐嶆寰呴殢璁胯鎯�")
+    private List<ServiceSubtask> pendingFollowUpAgainInfo;
+
+    @ApiModelProperty(value = "鍐嶆闅忚鎴愬姛璇︽儏")
+    private List<ServiceSubtask> followUpSuccessAgainInfo;
+
+    @ApiModelProperty(value = "鍐嶆闅忚澶辫触璇︽儏")
+    private List<ServiceSubtask> followUpFailAgainInfo;
+
+    @ApiModelProperty(value = "鍐嶆闅忚浜哄伐璇︽儏")
+    private List<ServiceSubtask> manualAgainInfo;
+
+    @ApiModelProperty(value = "鍐嶆闅忚璇煶璇︽儏")
+    private List<ServiceSubtask> voiceAgainInfo;
+
+    @ApiModelProperty(value = "鍐嶆闅忚鐭俊璇︽儏")
+    private List<ServiceSubtask> smsAgainInfo;
+
+    @ApiModelProperty(value = "鍐嶆闅忚寰俊璇︽儏")
+    private List<ServiceSubtask> wechatAgainInfo;
+
+    @ApiModelProperty(value = "1姝e父璇煶璇︽儏")
+    private List<ServiceSubtask> taskSituation1Info;
+
+    @ApiModelProperty(value = "2鎮h�呮嫆鎺ユ垨鎷掕璇︽儏")
+    private List<ServiceSubtask> taskSituation2Info;
+
+    @ApiModelProperty(value = "3闈㈣鎴栬�呮帴璇婅鎯�")
+    private List<ServiceSubtask> taskSituation3Info;
+
+    @ApiModelProperty(value = "4寰俊闅忚璇︽儏")
+    private List<ServiceSubtask> taskSituation4Info;
+
+    @ApiModelProperty(value = "5闅忚鐢佃瘽涓嶆纭鎯�")
+    private List<ServiceSubtask> taskSituation5Info;
+
+    @ApiModelProperty(value = "7鍏朵粬璇︽儏")
+    private List<ServiceSubtask> taskSituation6Info;
+
     @ApiModelProperty(value = "鍙婃椂鐜�")
     @Excel(name = " 鍙婃椂鐜� ")
     private Double rate = 0.0;
+
+    @ApiModelProperty(value = "瀹屾垚鐜�")
+    @Excel(name = " 瀹屾垚鐜� ")
+    private Double finishRate = 0.0;
 
     @ApiModelProperty(value = "棣栨闅忚鐜�")
     @Excel(name = " 棣栨闅忚鐜� ")
@@ -130,6 +212,10 @@
     @Excel(name = " 棣栨浜哄伐 ")
     private Long manual = 0L;
 
+    @ApiModelProperty(value = "棣栨璇煶")
+    @Excel(name = " 棣栨璇煶 ")
+    private Long voice = 0L;
+
     @ApiModelProperty(value = "棣栨鐭俊")
     @Excel(name = " 棣栨鐭俊 ")
     private Long sms = 0L;
@@ -138,12 +224,32 @@
     @Excel(name = " 棣栨寰俊 ")
     private Long weChat = 0L;
 
+    @ApiModelProperty(value = "棣栨浜哄伐鎴愬姛")
+    @Excel(name = " 棣栨浜哄伐鎴愬姛 ")
+    private Long manualSuccess = 0L;
+
+    @ApiModelProperty(value = "棣栨璇煶鎴愬姛")
+    @Excel(name = " 棣栨璇煶鎴愬姛 ")
+    private Long voiceSuccess = 0L;
+
+    @ApiModelProperty(value = "棣栨鐭俊鎴愬姛")
+    @Excel(name = " 棣栨鐭俊鎴愬姛 ")
+    private Long smsSuccess = 0L;
+
+    @ApiModelProperty(value = "棣栨寰俊鎴愬姛")
+    @Excel(name = " 棣栨寰俊鎴愬姛 ")
+    private Long weChatSuccess = 0L;
+
     @ApiModelProperty(value = "缁撴灉寮傚父")
     private Long abnormal = 0L;
 
     @ApiModelProperty(value = "浜屾搴旈殢璁�")
     @Excel(name = " 浜屾搴旈殢璁� ")
     private Long needFollowUpAgain = 0L;
+
+    @ApiModelProperty(value = "浜屾鏃犻渶闅忚")
+    @Excel(name = " 浜屾鏃犻渶闅忚 ")
+    private Long nonFollowUpAgain = 0L;
 
     @ApiModelProperty(value = "浜屾寰呴殢璁�")
     @Excel(name = " 浜屾寰呴殢璁� ")
@@ -165,13 +271,33 @@
     @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 = "浜屾寰俊")
+    @Excel(name = " 浜屾寰俊 ")
     private Long weChatAgain = 0L;
+
+    @ApiModelProperty(value = "浜屾浜哄伐鎴愬姛")
+    @Excel(name = " 浜屾浜哄伐鎴愬姛 ")
+    private Long manualAgainSuccess = 0L;
+
+    @ApiModelProperty(value = "浜屾璇煶鎴愬姛")
+    @Excel(name = " 浜屾璇煶鎴愬姛 ")
+    private Long voiceAgainSuccess = 0L;
+
+    @ApiModelProperty(value = "浜屾鐭俊鎴愬姛")
+    @Excel(name = " 浜屾鐭俊鎴愬姛 ")
+    private Long smsAgainSuccess = 0L;
+
+    @ApiModelProperty(value = "浜屾寰俊鎴愬姛")
+    @Excel(name = " 浜屾寰俊鎴愬姛 ")
+    private Long weChatAgainSuccess = 0L;
 
     @ApiModelProperty(value = "缁撴灉寮傚父")
     private Long abnormalAgain = 0L;
@@ -180,6 +306,16 @@
     @ApiModelProperty(value = "绉戝鐥呭尯")
     private Integer statisticaltype;
 
+    @ApiModelProperty(value = "浠诲姟ID", required = true)
+    private Long taskId;
+
+    @Excel(name = "浠诲姟鍚嶇О")
+    @ApiModelProperty(value = "浠诲姟鍚嶇О")
+    private String taskName;
+
+    @ApiModelProperty(value = "鐤剧梾鐥呯")
+    private String diagType;
+
 
     @ApiModelProperty(value = "鍖荤敓缂栫爜")
     private String drcode;

--
Gitblit v1.9.3