From 6bb028f4062241bc3c3bb29ca252a264fc9dd6b7 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 28 四月 2026 16:00:40 +0800
Subject: [PATCH] 【丽水】随访增加 首次随访语音详情、再次随访语音详情

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |  181 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 140 insertions(+), 41 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 3cf792e..e5ce5df 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -16,6 +16,7 @@
 import com.smartor.config.PhoneUtils;
 import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
 import com.smartor.domain.*;
+import com.smartor.domain.VO.HeLibraryCountVO;
 import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
 import com.smartor.domain.entity.ServiceSubtaskEntity;
 import com.smartor.mapper.*;
@@ -31,6 +32,7 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -2461,11 +2463,13 @@
         ssRate.setStarttime(serviceSubtaskCountReq.getStartTime());
         ssRate.setEndtime(serviceSubtaskCountReq.getEndTime());
         ssRate.setVisitCount(serviceSubtaskCountReq.getVisitCount());
+        ssRate.setServiceTypeList(serviceSubtaskCountReq.getServiceType());
         if (serviceSubtaskCountReq.getEndTime() != null && new Date().before(serviceSubtaskCountReq.getEndTime())) {
             ssRate.setEndtime(new Date());
         }
         ssRate.setGroupKey(groupKey);
         ssRate.setGroupKeyList(groupKeyList);
+        ssRate.setRateDay(serviceSubtaskCountReq.getRateDay());
         Map<String, Map<String, Object>> jsRates = new HashMap<>();
         if (!collect.isEmpty()) {
             jsRates = serviceSubtaskMapper.selectTimelyRateBatch(ssRate);
@@ -2473,7 +2477,7 @@
         return jsRates;
     }
 
-    @Override
+
     public List<ServiceSubtaskStatistic> getSfStatisticsExport(ServiceSubtaskCountReq serviceSubtaskCountReq) {
         List<ServiceSubtaskStatistic> sfStatistics = getSfStatistics(serviceSubtaskCountReq);
         // 娣诲姞鎬昏琛�
@@ -2485,6 +2489,12 @@
         }
 
         return sfStatistics;
+    }
+
+    @Override
+    public List<ServiceSubtaskIsAbnormalStatistic> getSfStatisticsIsAbnormalExport(ServiceSubtaskCountReq serviceSubtaskCountReq){
+
+        return null;
     }
 
     /**
@@ -2699,6 +2709,8 @@
             List<ServiceSubtask> followUpFailInfo = new ArrayList<>();
             //璁板綍棣栨闅忚浜哄伐璇︽儏
             List<ServiceSubtask> manualInfo = new ArrayList<>();
+            //璁板綍棣栨闅忚璇煶璇︽儏
+            List<ServiceSubtask> voiceInfo = new ArrayList<>();
             //璁板綍棣栨闅忚鐭俊璇︽儏
             List<ServiceSubtask> smsInfo = new ArrayList<>();
             //璁板綍棣栨闅忚寰俊璇︽儏
@@ -2712,11 +2724,13 @@
             List<ServiceSubtask> followUpSuccessAgainInfo = new ArrayList<>();
             //璁板綍鍐嶆闅忚澶辫触璇︽儏
             List<ServiceSubtask> followUpFailAgainInfo = new ArrayList<>();
-            //璁板綍棣栨闅忚浜哄伐璇︽儏
+            //璁板綍鍐嶆闅忚浜哄伐璇︽儏
             List<ServiceSubtask> manualAgainInfo = new ArrayList<>();
-            //璁板綍棣栨闅忚鐭俊璇︽儏
+            //璁板綍鍐嶆闅忚璇煶璇︽儏
+            List<ServiceSubtask> voiceAgainInfo = new ArrayList<>();
+            //璁板綍鍐嶆闅忚鐭俊璇︽儏
             List<ServiceSubtask> smsAgainInfo = new ArrayList<>();
-            //璁板綍棣栨闅忚寰俊璇︽儏
+            //璁板綍鍐嶆闅忚寰俊璇︽儏
             List<ServiceSubtask> wechatAgainInfo = new ArrayList<>();
 
             for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -2761,17 +2775,22 @@
                             followUpSuccessInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚浜哄伐 (涓嶇粺璁′笉鎵ц)
-                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("1")) {
+                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                             serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
                             manualInfo.add(serviceSubtask);
                         }
+                        //棣栨闅忚璇煶 (涓嶇粺璁′笉鎵ц)
+                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+                            serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
+                            voiceInfo.add(serviceSubtask);
+                        }
                         //棣栨闅忚鐭俊(涓嶇粺璁′笉鎵ц)
-                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("4")) {
+                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                             serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
                             smsInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚寰俊(涓嶇粺璁′笉鎵ц)
-                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("5")) {
+                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                             serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                             wechatInfo.add(serviceSubtask);
                         }
@@ -2782,17 +2801,22 @@
                             followUpSuccessInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚浜哄伐 (缁熻涓嶆墽琛�)
-                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                        if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                             serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
                             manualInfo.add(serviceSubtask);
                         }
+                        //棣栨闅忚璇煶 (缁熻涓嶆墽琛�)
+                        if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+                            serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
+                            voiceInfo.add(serviceSubtask);
+                        }
                         //棣栨闅忚鐭俊(缁熻涓嶆墽琛�)
-                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+                        if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                             serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
                             smsInfo.add(serviceSubtask);
                         }
                         //棣栨闅忚寰俊(缁熻涓嶆墽琛�)
-                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                        if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                             serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                             wechatInfo.add(serviceSubtask);
                         }
@@ -2834,17 +2858,22 @@
                             followUpSuccessAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚浜哄伐(涓嶇粺璁′笉鎵ц)
-                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("1")) {
+                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                             serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
                             manualAgainInfo.add(serviceSubtask);
                         }
+                        //鍐嶆闅忚璇煶(涓嶇粺璁′笉鎵ц)
+                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+                            serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
+                            voiceAgainInfo.add(serviceSubtask);
+                        }
                         //鍐嶆闅忚鐭俊(涓嶇粺璁′笉鎵ц)
-                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("4")) {
+                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                             serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
                             smsAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚寰俊(涓嶇粺璁′笉鎵ц)
-                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("5")) {
+                        if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                             serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                             wechatAgainInfo.add(serviceSubtask);
                         }
@@ -2855,17 +2884,22 @@
                             followUpSuccessAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚浜哄伐(缁熻涓嶆墽琛�)
-                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                        if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                             serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
                             manualAgainInfo.add(serviceSubtask);
                         }
+                        //鍐嶆闅忚璇煶(缁熻涓嶆墽琛�)
+                        if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+                            serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
+                            voiceAgainInfo.add(serviceSubtask);
+                        }
                         //鍐嶆闅忚鐭俊(缁熻涓嶆墽琛�)
-                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+                        if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                             serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
                             smsAgainInfo.add(serviceSubtask);
                         }
                         //鍐嶆闅忚寰俊(缁熻涓嶆墽琛�)
-                        if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                        if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                             serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                             wechatAgainInfo.add(serviceSubtask);
                         }
@@ -2914,6 +2948,8 @@
             serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
             //璁板綍棣栨闅忚浜哄伐璇︽儏
             serviceSubtaskStatistic.setManualInfo(manualInfo);
+            //璁板綍棣栨闅忚璇煶璇︽儏
+            serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
             //璁板綍棣栨闅忚鐭俊璇︽儏
             serviceSubtaskStatistic.setSmsInfo(smsInfo);
             //璁板綍棣栨闅忚寰俊璇︽儏
@@ -2928,6 +2964,8 @@
             serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
             //璁板綍鍐嶆闅忚浜哄伐璇︽儏
             serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
+            //璁板綍鍐嶆闅忚璇煶璇︽儏
+            serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
             //璁板綍鍐嶆闅忚鐭俊璇︽儏
             serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
             //璁板綍鍐嶆闅忚寰俊璇︽儏
@@ -2970,6 +3008,8 @@
         List<ServiceSubtask> followUpFailInfo = new ArrayList<>();
         //璁板綍棣栨闅忚浜哄伐璇︽儏
         List<ServiceSubtask> manualInfo = new ArrayList<>();
+        //璁板綍棣栨闅忚璇煶璇︽儏
+        List<ServiceSubtask> voiceInfo = new ArrayList<>();
         //璁板綍棣栨闅忚鐭俊璇︽儏
         List<ServiceSubtask> smsInfo = new ArrayList<>();
         //璁板綍棣栨闅忚寰俊璇︽儏
@@ -3017,17 +3057,22 @@
                         followUpSuccessInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚浜哄伐 (涓嶇粺璁′笉鎵ц)
-                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("1")) {
+                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                         serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
                         manualInfo.add(serviceSubtask);
                     }
+                    //棣栨闅忚璇煶 (涓嶇粺璁′笉鎵ц)
+                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+                        serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
+                        voiceInfo.add(serviceSubtask);
+                    }
                     //棣栨闅忚鐭俊(涓嶇粺璁′笉鎵ц)
-                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("4")) {
+                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                         serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
                         smsInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚寰俊(涓嶇粺璁′笉鎵ц)
-                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("5")) {
+                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                         serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                         wechatInfo.add(serviceSubtask);
                     }
@@ -3038,17 +3083,22 @@
                         followUpSuccessInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚浜哄伐 (缁熻涓嶆墽琛�)
-                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                    if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                         serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
                         manualInfo.add(serviceSubtask);
                     }
+                    //棣栨闅忚璇煶 (缁熻涓嶆墽琛�)
+                    if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+                        serviceSubtaskStatistic.setVoice(serviceSubtaskStatistic.getVoice() + 1L);
+                        voiceInfo.add(serviceSubtask);
+                    }
                     //棣栨闅忚鐭俊(缁熻涓嶆墽琛�)
-                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+                    if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                         serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
                         smsInfo.add(serviceSubtask);
                     }
                     //棣栨闅忚寰俊(缁熻涓嶆墽琛�)
-                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                    if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                         serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                         wechatInfo.add(serviceSubtask);
                     }
@@ -3097,6 +3147,8 @@
         serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
         //璁板綍棣栨闅忚浜哄伐璇︽儏
         serviceSubtaskStatistic.setManualInfo(manualInfo);
+        //璁板綍棣栨闅忚璇煶璇︽儏
+        serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
         //璁板綍棣栨闅忚鐭俊璇︽儏
         serviceSubtaskStatistic.setSmsInfo(smsInfo);
         //璁板綍棣栨闅忚寰俊璇︽儏
@@ -3138,6 +3190,8 @@
         List<ServiceSubtask> followUpFailAgainInfo = new ArrayList<>();
         //璁板綍鍐嶆闅忚浜哄伐璇︽儏
         List<ServiceSubtask> manualAgainInfo = new ArrayList<>();
+        //璁板綍鍐嶆闅忚璇煶璇︽儏
+        List<ServiceSubtask> voiceAgainInfo = new ArrayList<>();
         //璁板綍鍐嶆闅忚鐭俊璇︽儏
         List<ServiceSubtask> smsAgainInfo = new ArrayList<>();
         //璁板綍鍐嶆闅忚寰俊璇︽儏
@@ -3185,17 +3239,22 @@
                         followUpSuccessAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚浜哄伐(涓嶇粺璁′笉鎵ц)
-                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("1")) {
+                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                         serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
                         manualAgainInfo.add(serviceSubtask);
                     }
+                    //鍐嶆闅忚璇煶(涓嶇粺璁′笉鎵ц)
+                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+                        serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
+                        voiceAgainInfo.add(serviceSubtask);
+                    }
                     //鍐嶆闅忚鐭俊(涓嶇粺璁′笉鎵ц)
-                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("4")) {
+                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                         serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
                         smsAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚寰俊(涓嶇粺璁′笉鎵ц)
-                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && serviceSubtask.getPreachform().equals("5")) {
+                    if (serviceSubtask.getSendstate() != null && !serviceSubtask.getSendstate().equals(4L) && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                         serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                         wechatAgainInfo.add(serviceSubtask);
                     }
@@ -3206,17 +3265,22 @@
                         followUpSuccessAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚浜哄伐(缁熻涓嶆墽琛�)
-                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                    if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                         serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
                         manualAgainInfo.add(serviceSubtask);
                     }
+                    //鍐嶆闅忚璇煶(缁熻涓嶆墽琛�)
+                    if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("3")) {
+                        serviceSubtaskStatistic.setVoiceAgain(serviceSubtaskStatistic.getVoiceAgain() + 1L);
+                        voiceAgainInfo.add(serviceSubtask);
+                    }
                     //鍐嶆闅忚鐭俊(缁熻涓嶆墽琛�)
-                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+                    if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                         serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
                         smsAgainInfo.add(serviceSubtask);
                     }
                     //鍐嶆闅忚寰俊(缁熻涓嶆墽琛�)
-                    if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                    if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                         serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                         wechatAgainInfo.add(serviceSubtask);
                     }
@@ -3265,6 +3329,8 @@
         serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
         //璁板綍鍐嶆闅忚浜哄伐璇︽儏
         serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
+        //璁板綍鍐嶆闅忚璇煶璇︽儏
+        serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
         //璁板綍鍐嶆闅忚鐭俊璇︽儏
         serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
         //璁板綍鍐嶆闅忚寰俊璇︽儏
@@ -3325,13 +3391,13 @@
                 } else {
                     serviceSubtaskStatistic.setFollowUpRate("0.00%");
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                     serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                     serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                     serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
@@ -3357,13 +3423,13 @@
                 } else {
                     serviceSubtaskStatistic.setFollowUpRateAgain("0.00%");
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                     serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                     serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                     serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
@@ -3443,13 +3509,13 @@
                 } else {
                     serviceSubtaskStatistic.setFollowUpRate("0.00%");
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                     serviceSubtaskStatistic.setManual(serviceSubtaskStatistic.getManual() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                     serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                     serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
@@ -3475,13 +3541,13 @@
                 } else {
                     serviceSubtaskStatistic.setFollowUpRateAgain("0.00%");
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("1")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("1")) {
                     serviceSubtaskStatistic.setManualAgain(serviceSubtaskStatistic.getManualAgain() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
                     serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
                 }
-                if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("5")) {
+                if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
                     serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
                 }
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
@@ -3587,7 +3653,8 @@
         map.put("content", sendMagParam.getContent());
         String result = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(map));
         redisCache.setCacheObject(subTaskId + "recordAccept-hungup", "1", 10, TimeUnit.MINUTES);
-        if (StringUtils.isNotEmpty(serviceSubtask.getRemark())) serviceSubtask.setRemark("鐢佃瘽鍙戦�佹嫆鎺�,鐭俊琛ュ伩鍙戦�佹垚鍔�");
+        if (StringUtils.isNotEmpty(serviceSubtask.getRemark()))
+            serviceSubtask.setRemark("鐢佃瘽鍙戦�佹嫆鎺�,鐭俊琛ュ伩鍙戦�佹垚鍔�");
         else serviceSubtask.setRemark("鐭俊琛ュ伩鍙戦�佹垚鍔�");
         serviceSubtask.setSendstate(3L);
         serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
@@ -4170,6 +4237,38 @@
         }
     }
 
+    @Override
+    public Map<String, Object> getHeLibraryCount(@RequestBody HeLibraryCountVO heLibraryCountVO) {
+        if (ObjectUtils.isEmpty(heLibraryCountVO)) {
+            return new HashMap<>();
+        }
+        // 1. 鏌ヨ鍒嗙粍缁熻锛堝彂閫佹�婚噺銆佸彂閫佹垚鍔熼噺銆佸凡璇婚噺锛�
+        List<Map<String, Object>> groupStats = serviceSubtaskMapper.getHeLibraryCount(heLibraryCountVO);
+    
+        // 2. 璁＄畻鍚勭粍鐨勫彂閫佹垚鍔熺巼鍜屽凡璇荤巼
+        List<Map<String, Object>> result = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(groupStats)) {
+            for (Map<String, Object> row : groupStats) {
+                long totalCount = row.get("totalCount") != null ? ((Number) row.get("totalCount")).longValue() : 0L;
+                long sendSuccessCount = row.get("sendSuccessCount") != null ? ((Number) row.get("sendSuccessCount")).longValue() : 0L;
+                long readCount = row.get("readCount") != null ? ((Number) row.get("readCount")).longValue() : 0L;
+                // 鍙戦�佹垚鍔熺巼
+                double sendSuccessRate = totalCount > 0 ? (double) sendSuccessCount / totalCount : 0.0;
+                // 宸茶鐜囷紙鍩轰簬鍙戦�佹垚鍔熺殑鏁伴噺璁＄畻锛�
+                double readRate = sendSuccessCount > 0 ? (double) readCount / sendSuccessCount : 0.0;
+                row.put("sendSuccessRate", sendSuccessRate);
+                row.put("readRate", readRate);
+                result.add(row);
+            }
+        }
+    
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("list", result);
+        resultMap.put("total", result.size());
+        return resultMap;
+    }
+
+
     private Boolean saveServiceSubtaskDetail(ServiceSubtask serviceSubtask) {
         Boolean result = true;
         //3.4 濡傛灉3.1鎴�3.2涓簍rue鐨勮瘽锛屾牴鎹畉ype鍒ゆ柇浠�涔堢被鍨�

--
Gitblit v1.9.3