From 7b67b02783e2f6a2b307c6c7abf6d8e3c17abd68 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 23 五月 2026 22:19:16 +0800
Subject: [PATCH] 新增sendstateView（1：待随访（2 待发送）；2：随访中（1 被领取、3 已发送）、3：未完成（5 发送失败、7、超时）、4：已完成（ 6 已完成）、5：无需随访（4 不执行））
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 200 insertions(+), 1 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 66cdb84..0d3a2c3 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -348,6 +348,15 @@
@Override
public List<ServiceSubtaskRes> patItem(ServiceSubtaskEntity serviceSubtaskEntity) {
+ if (serviceSubtaskEntity.getSendstateView() != null) {
+ // 1锛氬緟闅忚锛�2 寰呭彂閫侊級锛�2锛氶殢璁夸腑锛�3 宸插彂閫併��1 琚鍙栵級銆�3锛氭湭瀹屾垚锛�5 鍙戦�佸け璐ャ��7銆佽秴鏃讹級銆�4锛氬凡瀹屾垚锛� 6 宸插畬鎴愶級銆�5锛氭棤闇�闅忚锛�4 涓嶆墽琛岋級
+ if (serviceSubtaskEntity.getSendstateView() == 1) serviceSubtaskEntity.setSendstates(Arrays.asList(2L));
+ if (serviceSubtaskEntity.getSendstateView() == 2) serviceSubtaskEntity.setSendstates(Arrays.asList(1L, 3L));
+ if (serviceSubtaskEntity.getSendstateView() == 3) serviceSubtaskEntity.setSendstates(Arrays.asList(5L, 7L));
+ if (serviceSubtaskEntity.getSendstateView() == 4) serviceSubtaskEntity.setSendstates(Arrays.asList(6L));
+ if (serviceSubtaskEntity.getSendstateView() == 5) serviceSubtaskEntity.setSendstates(Arrays.asList(4L));
+ }
+
List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskEntity);
List<ServiceSubtaskRes> serviceSubtaskResList = new ArrayList<>();
@@ -356,6 +365,14 @@
if (ObjectUtils.isNotEmpty(serviceSubtask.getContinueContent())) {
serviceSubtaskRes.setContinueContent(serviceSubtask.getContinueContent());
}
+// 1锛氬緟闅忚锛�2 寰呭彂閫侊級锛�2锛氶殢璁夸腑锛�3 宸插彂閫併��1 琚鍙栵級銆�3锛氭湭瀹屾垚锛�5 鍙戦�佸け璐ャ��7銆佽秴鏃讹級銆�4锛氬凡瀹屾垚锛� 6 宸插畬鎴愶級銆�5锛氭棤闇�闅忚锛�4 涓嶆墽琛岋級
+ if (serviceSubtaskRes.getSendstate() == 2) serviceSubtaskRes.setSendstateView(1L);
+ if (serviceSubtaskRes.getSendstate() == 1 || serviceSubtaskRes.getSendstate() == 3L)
+ serviceSubtaskRes.setSendstateView(2L);
+ if (serviceSubtaskRes.getSendstate() == 5 || serviceSubtaskRes.getSendstate() == 7L)
+ serviceSubtaskRes.setSendstateView(3L);
+ if (serviceSubtaskRes.getSendstate() == 6) serviceSubtaskRes.setSendstateView(4L);
+ if (serviceSubtaskRes.getSendstate() == 4) serviceSubtaskRes.setSendstateView(5L);
serviceSubtaskResList.add(serviceSubtaskRes);
}
return serviceSubtaskResList;
@@ -2730,6 +2747,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鍑洪櫌浜烘璇︽儏
+ serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
//鏃犻渶闅忚璇︽儏
List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
//璁板綍杩囨护鎮ｈ�呰鎯�
@@ -2767,6 +2786,14 @@
List<ServiceSubtask> smsAgainInfo = new ArrayList<>();
//璁板綍鍐嶆闅忚寰俊璇︽儏
List<ServiceSubtask> wechatAgainInfo = new ArrayList<>();
+
+ //璁板綍闅忚鎯呭喌璇︽儏
+ List<ServiceSubtask> taskSituation1Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation2Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation3Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation4Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation5Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation6Info = new ArrayList<>();
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
//鏃犻渶闅忚浜烘
@@ -2953,21 +2980,27 @@
//闅忚鎯呭喌
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 1) {
serviceSubtaskStatistic.setTaskSituation1(serviceSubtaskStatistic.getTaskSituation1() + 1);
+ taskSituation1Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 2) {
serviceSubtaskStatistic.setTaskSituation2(serviceSubtaskStatistic.getTaskSituation2() + 1);
+ taskSituation2Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 3) {
serviceSubtaskStatistic.setTaskSituation3(serviceSubtaskStatistic.getTaskSituation3() + 1);
+ taskSituation3Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 4) {
serviceSubtaskStatistic.setTaskSituation4(serviceSubtaskStatistic.getTaskSituation4() + 1);
+ taskSituation4Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 5) {
serviceSubtaskStatistic.setTaskSituation5(serviceSubtaskStatistic.getTaskSituation5() + 1);
+ taskSituation5Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 7) {
serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
+ taskSituation6Info.add(serviceSubtask);
}
}
serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
@@ -3005,6 +3038,14 @@
serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
//璁板綍鍐嶆闅忚寰俊璇︽儏
serviceSubtaskStatistic.setWechatAgainInfo(wechatAgainInfo);
+
+ //闅忚鎯呭喌璇︽儏
+ serviceSubtaskStatistic.setTaskSituation1Info(taskSituation1Info);
+ serviceSubtaskStatistic.setTaskSituation2Info(taskSituation2Info);
+ serviceSubtaskStatistic.setTaskSituation3Info(taskSituation3Info);
+ serviceSubtaskStatistic.setTaskSituation4Info(taskSituation4Info);
+ serviceSubtaskStatistic.setTaskSituation5Info(taskSituation5Info);
+ serviceSubtaskStatistic.setTaskSituation6Info(taskSituation6Info);
return serviceSubtaskStatistic;
}
return serviceSubtaskStatistic;
@@ -3029,6 +3070,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鍑洪櫌浜烘璇︽儏
+ serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
//鏃犻渶闅忚璇︽儏
List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
//璁板綍杩囨护鎮ｈ�呰鎯�
@@ -3049,6 +3092,14 @@
List<ServiceSubtask> smsInfo = new ArrayList<>();
//璁板綍棣栨闅忚寰俊璇︽儏
List<ServiceSubtask> wechatInfo = new ArrayList<>();
+
+ //璁板綍闅忚鎯呭喌璇︽儏
+ List<ServiceSubtask> taskSituation1Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation2Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation3Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation4Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation5Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation6Info = new ArrayList<>();
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
//鏃犻渶闅忚浜烘
@@ -3152,21 +3203,27 @@
//闅忚鎯呭喌
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 1) {
serviceSubtaskStatistic.setTaskSituation1(serviceSubtaskStatistic.getTaskSituation1() + 1);
+ taskSituation1Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 2) {
serviceSubtaskStatistic.setTaskSituation2(serviceSubtaskStatistic.getTaskSituation2() + 1);
+ taskSituation2Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 3) {
serviceSubtaskStatistic.setTaskSituation3(serviceSubtaskStatistic.getTaskSituation3() + 1);
+ taskSituation3Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 4) {
serviceSubtaskStatistic.setTaskSituation4(serviceSubtaskStatistic.getTaskSituation4() + 1);
+ taskSituation4Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 5) {
serviceSubtaskStatistic.setTaskSituation5(serviceSubtaskStatistic.getTaskSituation5() + 1);
+ taskSituation5Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 7) {
serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
+ taskSituation6Info.add(serviceSubtask);
}
}
serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
@@ -3188,6 +3245,14 @@
serviceSubtaskStatistic.setSmsInfo(smsInfo);
//璁板綍棣栨闅忚寰俊璇︽儏
serviceSubtaskStatistic.setWechatInfo(wechatInfo);
+
+ //闅忚鎯呭喌璇︽儏
+ serviceSubtaskStatistic.setTaskSituation1Info(taskSituation1Info);
+ serviceSubtaskStatistic.setTaskSituation2Info(taskSituation2Info);
+ serviceSubtaskStatistic.setTaskSituation3Info(taskSituation3Info);
+ serviceSubtaskStatistic.setTaskSituation4Info(taskSituation4Info);
+ serviceSubtaskStatistic.setTaskSituation5Info(taskSituation5Info);
+ serviceSubtaskStatistic.setTaskSituation6Info(taskSituation6Info);
return serviceSubtaskStatistic;
}
@@ -3210,6 +3275,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鍑洪櫌浜烘璇︽儏
+ serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
//鏃犻渶闅忚璇︽儏
List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
//璁板綍杩囨护鎮ｈ�呰鎯�
@@ -3231,6 +3298,14 @@
List<ServiceSubtask> smsAgainInfo = new ArrayList<>();
//璁板綍鍐嶆闅忚寰俊璇︽儏
List<ServiceSubtask> wechatAgainInfo = new ArrayList<>();
+
+ //璁板綍闅忚鎯呭喌璇︽儏
+ List<ServiceSubtask> taskSituation1Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation2Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation3Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation4Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation5Info = new ArrayList<>();
+ List<ServiceSubtask> taskSituation6Info = new ArrayList<>();
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
//鏃犻渶闅忚浜烘
@@ -3334,21 +3409,27 @@
//闅忚鎯呭喌
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 1) {
serviceSubtaskStatistic.setTaskSituation1(serviceSubtaskStatistic.getTaskSituation1() + 1);
+ taskSituation1Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 2) {
serviceSubtaskStatistic.setTaskSituation2(serviceSubtaskStatistic.getTaskSituation2() + 1);
+ taskSituation2Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 3) {
serviceSubtaskStatistic.setTaskSituation3(serviceSubtaskStatistic.getTaskSituation3() + 1);
+ taskSituation3Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 4) {
serviceSubtaskStatistic.setTaskSituation4(serviceSubtaskStatistic.getTaskSituation4() + 1);
+ taskSituation4Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 5) {
serviceSubtaskStatistic.setTaskSituation5(serviceSubtaskStatistic.getTaskSituation5() + 1);
+ taskSituation5Info.add(serviceSubtask);
}
if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 7) {
serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
+ taskSituation6Info.add(serviceSubtask);
}
}
serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
@@ -3370,6 +3451,14 @@
serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
//璁板綍鍐嶆闅忚寰俊璇︽儏
serviceSubtaskStatistic.setWechatAgainInfo(wechatAgainInfo);
+
+ //闅忚鎯呭喌璇︽儏
+ serviceSubtaskStatistic.setTaskSituation1Info(taskSituation1Info);
+ serviceSubtaskStatistic.setTaskSituation2Info(taskSituation2Info);
+ serviceSubtaskStatistic.setTaskSituation3Info(taskSituation3Info);
+ serviceSubtaskStatistic.setTaskSituation4Info(taskSituation4Info);
+ serviceSubtaskStatistic.setTaskSituation5Info(taskSituation5Info);
+ serviceSubtaskStatistic.setTaskSituation6Info(taskSituation6Info);
return serviceSubtaskStatistic;
}
@@ -3386,6 +3475,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鍑洪櫌浜烘璇︽儏
+ serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
serviceSubtaskStatistic.setJoyCount(0);
serviceSubtaskStatistic.setJoyAllCount(0);
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -3489,6 +3580,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鍑洪櫌浜烘璇︽儏
+ serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
serviceSubtaskStatistic.setJoyCount(0);
serviceSubtaskStatistic.setJoyAllCount(0);
@@ -3505,6 +3598,50 @@
List<ServiceSubtaskCount> subCounts = new ArrayList<>();
subCounts = serviceSubtaskMapper.getSfStatisticsCategory(serviceSubtaskCountReq);
+ //鏃犻渶闅忚璇︽儏
+ List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
+ //搴旈殢璁胯鎯�
+ List<ServiceSubtask> followUpNeededAllInfo = new ArrayList<>();
+ //璁板綍棣栨搴旈殢璁胯鎯�
+ List<ServiceSubtask> needFollowUpInfo = new ArrayList<>();
+ //璁板綍棣栨寰呴殢璁胯鎯�
+ List<ServiceSubtask> pendingFollowUpInfo = new ArrayList<>();
+ //璁板綍棣栨闅忚鎴愬姛璇︽儏
+ List<ServiceSubtask> followUpSuccessInfo = new ArrayList<>();
+ //璁板綍棣栨闅忚澶辫触璇︽儏
+ List<ServiceSubtask> followUpFailInfo = new ArrayList<>();
+ //璁板綍棣栨闅忚浜哄伐璇︽儏
+ List<ServiceSubtask> manualInfo = new ArrayList<>();
+ //璁板綍棣栨闅忚璇煶璇︽儏
+ List<ServiceSubtask> voiceInfo = new ArrayList<>();
+ //璁板綍棣栨闅忚鐭俊璇︽儏
+ List<ServiceSubtask> smsInfo = new ArrayList<>();
+ //璁板綍棣栨闅忚寰俊璇︽儏
+ List<ServiceSubtask> wechatInfo = new ArrayList<>();
+
+ //璁板綍棣栨缁撴灉寮傚父璇︽儏
+ List<ServiceSubtask> abnormalInfo = new ArrayList<>();
+
+ //璁板綍鍐嶆搴旈殢璁胯鎯�
+ List<ServiceSubtask> needFollowUpAgainInfo = new ArrayList<>();
+ //璁板綍鍐嶆寰呴殢璁胯鎯�
+ List<ServiceSubtask> pendingFollowUpAgainInfo = new ArrayList<>();
+ //璁板綍鍐嶆闅忚鎴愬姛璇︽儏
+ 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<>();
+ //璁板綍鍐嶆缁撴灉寮傚父璇︽儏
+ List<ServiceSubtask> abnormalAgainInfo = new ArrayList<>();
+
+
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
List<ServiceSubtaskCount> subCountTemp = subCounts.stream().filter(r -> r.getSubTaskId().equals(serviceSubtask.getId())).collect(Collectors.toList());
@@ -3518,25 +3655,31 @@
//鏃犻渶闅忚浜烘
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
+ nonFollowUpInfo.add(serviceSubtask);
}
//搴旈殢璁夸汉娆�
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
serviceSubtaskStatistic.setFollowUpNeeded(serviceSubtaskStatistic.getFollowUpNeeded() + 1L);
+ followUpNeededAllInfo.add(serviceSubtask);
}
//棣栨鍑洪櫌闅忚
if (serviceSubtask.getVisitCount() != null && serviceSubtask.getVisitCount() == 1) {
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
serviceSubtaskStatistic.setNeedFollowUp(serviceSubtaskStatistic.getNeedFollowUp() + 1L);
+ needFollowUpInfo.add(serviceSubtask);
}
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
serviceSubtaskStatistic.setPendingFollowUp(serviceSubtaskStatistic.getPendingFollowUp() + 1L);
+ pendingFollowUpInfo.add(serviceSubtask);
}
if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 6)) {
serviceSubtaskStatistic.setFollowUpSuccess(serviceSubtaskStatistic.getFollowUpSuccess() + 1L);
+ followUpSuccessInfo.add(serviceSubtask);
}
if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 5 || serviceSubtask.getSendstate() == 7)) {
serviceSubtaskStatistic.setFollowUpFail(serviceSubtaskStatistic.getFollowUpFail() + 1L);
+ followUpFailInfo.add(serviceSubtask);
}
if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccess() + serviceSubtaskStatistic.getFollowUpFail()) / serviceSubtaskStatistic.getNeedFollowUp();
@@ -3546,29 +3689,41 @@
}
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 && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
serviceSubtaskStatistic.setSms(serviceSubtaskStatistic.getSms() + 1L);
+ smsInfo.add(serviceSubtask);
}
if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
serviceSubtaskStatistic.setWeChat(serviceSubtaskStatistic.getWeChat() + 1L);
+ wechatInfo.add(serviceSubtask);
}
if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
serviceSubtaskStatistic.setAbnormal(serviceSubtaskStatistic.getAbnormal() + 1L);
+ abnormalInfo.add(serviceSubtask);
}
}//浜屾鍑洪櫌闅忚
else if (serviceSubtask.getVisitCount() != null && serviceSubtask.getVisitCount() > 1) {
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
serviceSubtaskStatistic.setNeedFollowUpAgain(serviceSubtaskStatistic.getNeedFollowUpAgain() + 1L);
+ needFollowUpAgainInfo.add(serviceSubtask);
}
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 2) {
serviceSubtaskStatistic.setPendingFollowUpAgain(serviceSubtaskStatistic.getPendingFollowUpAgain() + 1L);
+ pendingFollowUpAgainInfo.add(serviceSubtask);
}
if (serviceSubtask.getSendstate() != null && (serviceSubtask.getSendstate() == 1 || serviceSubtask.getSendstate() == 3 || serviceSubtask.getSendstate() == 6)) {
serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
+ followUpSuccessAgainInfo.add(serviceSubtask);
}
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 5) {
serviceSubtaskStatistic.setFollowUpFailAgain(serviceSubtaskStatistic.getFollowUpFailAgain() + 1L);
+ followUpFailAgainInfo.add(serviceSubtask);
}
if (serviceSubtaskStatistic.getNeedFollowUp() > 0) {
double rate = (double) (serviceSubtaskStatistic.getFollowUpSuccessAgain() + serviceSubtaskStatistic.getFollowUpFailAgain()) / serviceSubtaskStatistic.getNeedFollowUpAgain();
@@ -3578,20 +3733,64 @@
}
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 && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("4")) {
serviceSubtaskStatistic.setSmsAgain(serviceSubtaskStatistic.getSmsAgain() + 1L);
+ smsAgainInfo.add(serviceSubtask);
}
if (serviceSubtask.getSendstate() != null && ObjectUtils.isNotEmpty(serviceSubtask.getCurrentPreachform()) && serviceSubtask.getCurrentPreachform().equals("5")) {
serviceSubtaskStatistic.setWeChatAgain(serviceSubtaskStatistic.getWeChatAgain() + 1L);
+ wechatAgainInfo.add(serviceSubtask);
}
if (serviceSubtask.getSendstate() != null && serviceSubtask.getExcep().equals("1")) {
serviceSubtaskStatistic.setAbnormalAgain(serviceSubtaskStatistic.getAbnormalAgain() + 1L);
+ abnormalAgainInfo.add(serviceSubtask);
}
}
-
}
+ //璁板綍鏃犻渶闅忚璇︽儏
+ serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
+ //璁板綍闇�闅忚璇︽儏
+ serviceSubtaskStatistic.setFollowUpNeededAllInfo(followUpNeededAllInfo);
+ //璁板綍棣栨搴旈殢璁胯鎯�
+ serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
+ //璁板綍棣栨寰呴殢璁胯鎯�
+ serviceSubtaskStatistic.setPendingFollowUpInfo(pendingFollowUpInfo);
+ //璁板綍棣栨闅忚鎴愬姛璇︽儏
+ serviceSubtaskStatistic.setFollowUpSuccessInfo(followUpSuccessInfo);
+ //璁板綍棣栨闅忚澶辫触璇︽儏
+ serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
+ //璁板綍棣栨闅忚浜哄伐璇︽儏
+ serviceSubtaskStatistic.setManualInfo(manualInfo);
+ //璁板綍棣栨闅忚璇煶璇︽儏
+ serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
+ //璁板綍棣栨闅忚鐭俊璇︽儏
+ serviceSubtaskStatistic.setSmsInfo(smsInfo);
+ //璁板綍棣栨闅忚寰俊璇︽儏
+ serviceSubtaskStatistic.setWechatInfo(wechatInfo);
+ //璁板綍鍐嶆搴旈殢璁胯鎯�
+ serviceSubtaskStatistic.setNeedFollowUpAgainInfo(needFollowUpAgainInfo);
+ //璁板綍鍐嶆寰呴殢璁胯鎯�
+ serviceSubtaskStatistic.setPendingFollowUpAgainInfo(pendingFollowUpAgainInfo);
+ //璁板綍鍐嶆闅忚鎴愬姛璇︽儏
+ serviceSubtaskStatistic.setFollowUpSuccessAgainInfo(followUpSuccessAgainInfo);
+ //璁板綍鍐嶆闅忚澶辫触璇︽儏
+ serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
+ //璁板綍鍐嶆闅忚浜哄伐璇︽儏
+ serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
+ //璁板綍鍐嶆闅忚璇煶璇︽儏
+ serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
+ //璁板綍鍐嶆闅忚鐭俊璇︽儏
+ serviceSubtaskStatistic.setSmsAgainInfo(smsAgainInfo);
+ //璁板綍鍐嶆闅忚寰俊璇︽儏
+ serviceSubtaskStatistic.setWechatAgainInfo(wechatAgainInfo);
return serviceSubtaskStatistic;
}
--
Gitblit v1.9.3