From 85a5ca43ff5a05dcb34d4e90b9c96fd0dd16aa2f Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 22 五月 2026 16:00:43 +0800
Subject: [PATCH] 【丽水】暂时不加 campusid
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 431 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 376 insertions(+), 55 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..00f59ff 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;
@@ -162,6 +164,12 @@
private Integer phoneUpEveryHour;
@Value("${phoneEndHour}")
private Integer phoneEndHour;
+
+ @Autowired
+ private Icd10Mapper icd10Mapper;
+
+ @Value("${spring.profiles.active}")
+ private String active;
/**
* 鏌ヨ鍗曚竴浠诲姟锛堥殢璁匡級
@@ -513,6 +521,23 @@
return serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
}
+ @Override
+ public Boolean updateTemplate(ServiceSubtaskTemplateVO serviceSubtaskTemplateVO) {
+ ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(serviceSubtaskTemplateVO.getSubId());
+ if (serviceSubtask == null || serviceSubtask.getSendstate() != 2L)
+ throw new BaseException("璇ヤ换鍔″凡鍙戦�佺粰鎮ｈ�咃紝涓嶈兘鍐嶈繘琛屼慨鏀规ā鏉�");
+
+ Integer taskTempid = svyTaskTemplateService.saveOrUpdateTemplate(serviceSubtaskTemplateVO.getSvyTaskTemplateVO());
+ if (taskTempid == null) return false;
+
+ String tempName = svyTaskTemplateService.selectSvyTaskTemplateBySvyid(Long.valueOf(taskTempid)).getSvyname();
+ serviceSubtask.setTemplateid(taskTempid.longValue());
+ serviceSubtask.setTemplatename(tempName);
+ serviceSubtask.setUpdateBy(serviceSubtaskTemplateVO.getUpdateBy());
+ serviceSubtask.setLibtemplateid(serviceSubtaskTemplateVO.getSvyTaskTemplateVO().getTemplateid());
+ return updateServiceSubtask(serviceSubtask);
+ }
+
/**
* 鎵归噺鍒犻櫎鍗曚竴浠诲姟锛堥殢璁匡級
*
@@ -613,6 +638,7 @@
ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
serviceTaskdiag.setTaskId(serviceTask.getTaskid());
serviceTaskdiag.setTaskName(serviceTask.getTaskName());
+ serviceTaskdiag.setServiceType(serviceTaskVO.getServiceType());
serviceTaskdiag.setLongtask(Long.valueOf(serviceTask.getLongTask()));
if (serviceTaskVO.getLongTask() == 1) serviceTaskdiag.setLongtask(1L);
serviceTaskdiag.setIcd10code(serviceTaskVO.getIcd10code());
@@ -620,11 +646,18 @@
serviceTaskdiag.setGuid(serviceTask.getGuid());
serviceTaskdiag.setOrgid(serviceTask.getOrgid());
serviceTaskdiag.setCreateTime(new Date());
+ serviceTaskdiag.setDeptCode(serviceTaskVO.getDeptcode());
+ serviceTaskdiag.setDeptName(serviceTaskVO.getDeptname());
+ serviceTaskdiag.setWardCode(serviceTaskVO.getLeavehospitaldistrictcode());
+ serviceTaskdiag.setWardName(serviceTaskVO.getLeavehospitaldistrictname());
+ //鍗楀崕闄勪竴鐨刬cd10code鏄湁閲嶅鐨勶紝鎵�浠ヤ笉鑳界敤鍗楀崕闄勪竴鐨刬cd10code鍘绘煡璇�
log.info("----serviceTaskdiag鐨勫�间负锛歿}", serviceTaskdiag);
- if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
+ if (!StringUtils.isEmpty(serviceTaskVO.getIcd10name())) {
+ String[] Icd10Names = serviceTaskVO.getIcd10name().split(",");
String[] Icd10codes = serviceTaskVO.getIcd10code().split(",");
- for (String icd10code : Icd10codes) {
- serviceTaskdiag.setIcd10code(icd10code);
+ for (int i = 0; i < Icd10Names.length; i++) {
+ serviceTaskdiag.setIcd10code(Icd10codes[i]);
+ serviceTaskdiag.setIcd10name(Icd10Names[i]);
serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
}
}
@@ -640,12 +673,6 @@
serviceTaskoper.setOrgid(serviceTask.getOrgid());
serviceTaskoper.setCreateTime(new Date());
if (StringUtils.isNotEmpty(serviceTaskVO.getOplevelcode())) {
-// String[] opcodes = serviceTaskVO.getOpcode().split(",");
-// for (String opcode : opcodes) {
-// serviceTaskoper.setOpcode(opcode);
-// log.info("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
-// serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
-// }
log.info("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
}
@@ -849,16 +876,26 @@
serviceTaskdiag.setIcd10name(serviceTaskVO.getIcd10name());
serviceTaskdiag.setGuid(serviceTask.getGuid());
serviceTaskdiag.setOrgid(serviceTask.getOrgid());
+ serviceTaskdiag.setDeptCode(serviceTaskVO.getDeptcode());
+ serviceTaskdiag.setDeptName(serviceTaskVO.getDeptname());
+ serviceTaskdiag.setWardCode(serviceTaskVO.getLeavehospitaldistrictcode());
+ serviceTaskdiag.setWardName(serviceTaskVO.getLeavehospitaldistrictname());
serviceTaskdiag.setUpdateTime(new Date());
if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
String[] icd10codes = serviceTaskVO.getIcd10code().split(",");
- for (String icdcode : icd10codes) {
+ String[] icd10names = serviceTaskVO.getIcd10name().split(",");
+ if (icd10codes.length != icd10names.length) {
+ throw new BaseException("鐤剧梾缂栫爜鍜岀柧鐥呭悕绉版暟閲忎笉涓�鑷�");
+ }
+ for (int i = 0; i < icd10codes.length; i++) {
//鍏堟煡璇竴涓嬫槸鍚﹀瓨鍦�
ServiceTaskdiag serviceTaskdiag2 = new ServiceTaskdiag();
serviceTaskdiag2.setTaskId(serviceTaskVO.getTaskid());
- serviceTaskdiag2.setIcd10code(icdcode);
+ serviceTaskdiag2.setIcd10code(icd10codes[i]);
+ serviceTaskdiag2.setIcd10name(icd10names[i]);
List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag2);
- serviceTaskdiag.setIcd10code(icdcode);
+ serviceTaskdiag.setIcd10code(icd10codes[i]);
+ serviceTaskdiag.setIcd10name(icd10names[i]);
log.info("----serviceTaskdiag鏇存柊鐨勫�间负锛歿}", serviceTaskdiag);
if (CollectionUtils.isNotEmpty(serviceTaskdiags)) {
serviceTaskdiag.setId(serviceTaskdiags.get(0).getId());
@@ -2461,11 +2498,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 +2512,7 @@
return jsRates;
}
- @Override
+
public List<ServiceSubtaskStatistic> getSfStatisticsExport(ServiceSubtaskCountReq serviceSubtaskCountReq) {
List<ServiceSubtaskStatistic> sfStatistics = getSfStatistics(serviceSubtaskCountReq);
// 娣诲姞鎬昏琛�
@@ -2485,6 +2524,12 @@
}
return sfStatistics;
+ }
+
+ @Override
+ public List<ServiceSubtaskIsAbnormalStatistic> getSfStatisticsIsAbnormalExport(ServiceSubtaskCountReq serviceSubtaskCountReq) {
+
+ return null;
}
/**
@@ -2685,6 +2730,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鍑洪櫌浜烘璇︽儏
+ serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
//鏃犻渶闅忚璇︽儏
List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
//璁板綍杩囨护鎮ｈ�呰鎯�
@@ -2699,6 +2746,8 @@
List<ServiceSubtask> followUpFailInfo = new ArrayList<>();
//璁板綍棣栨闅忚浜哄伐璇︽儏
List<ServiceSubtask> manualInfo = new ArrayList<>();
+ //璁板綍棣栨闅忚璇煶璇︽儏
+ List<ServiceSubtask> voiceInfo = new ArrayList<>();
//璁板綍棣栨闅忚鐭俊璇︽儏
List<ServiceSubtask> smsInfo = new ArrayList<>();
//璁板綍棣栨闅忚寰俊璇︽儏
@@ -2712,12 +2761,22 @@
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> 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) {
//鏃犻渶闅忚浜烘
@@ -2761,17 +2820,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 +2846,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 +2903,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 +2929,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);
}
@@ -2884,21 +2963,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);
@@ -2914,6 +2999,8 @@
serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
//璁板綍棣栨闅忚浜哄伐璇︽儏
serviceSubtaskStatistic.setManualInfo(manualInfo);
+ //璁板綍棣栨闅忚璇煶璇︽儏
+ serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
//璁板綍棣栨闅忚鐭俊璇︽儏
serviceSubtaskStatistic.setSmsInfo(smsInfo);
//璁板綍棣栨闅忚寰俊璇︽儏
@@ -2928,10 +3015,20 @@
serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
//璁板綍鍐嶆闅忚浜哄伐璇︽儏
serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
+ //璁板綍鍐嶆闅忚璇煶璇︽儏
+ serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
//璁板綍鍐嶆闅忚鐭俊璇︽儏
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;
@@ -2956,6 +3053,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鍑洪櫌浜烘璇︽儏
+ serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
//鏃犻渶闅忚璇︽儏
List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
//璁板綍杩囨护鎮ｈ�呰鎯�
@@ -2970,10 +3069,20 @@
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> 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) {
//鏃犻渶闅忚浜烘
@@ -3017,17 +3126,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 +3152,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);
}
@@ -3067,21 +3186,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);
@@ -3097,10 +3222,20 @@
serviceSubtaskStatistic.setFollowUpFailInfo(followUpFailInfo);
//璁板綍棣栨闅忚浜哄伐璇︽儏
serviceSubtaskStatistic.setManualInfo(manualInfo);
+ //璁板綍棣栨闅忚璇煶璇︽儏
+ serviceSubtaskStatistic.setVoiceInfo(voiceInfo);
//璁板綍棣栨闅忚鐭俊璇︽儏
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;
}
@@ -3123,6 +3258,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鍑洪櫌浜烘璇︽儏
+ serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
//鏃犻渶闅忚璇︽儏
List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
//璁板綍杩囨护鎮ｈ�呰鎯�
@@ -3138,10 +3275,20 @@
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> 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) {
//鏃犻渶闅忚浜烘
@@ -3185,17 +3332,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 +3358,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);
}
@@ -3235,21 +3392,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);
@@ -3265,10 +3428,20 @@
serviceSubtaskStatistic.setFollowUpFailAgainInfo(followUpFailAgainInfo);
//璁板綍鍐嶆闅忚浜哄伐璇︽儏
serviceSubtaskStatistic.setManualAgainInfo(manualAgainInfo);
+ //璁板綍鍐嶆闅忚璇煶璇︽儏
+ serviceSubtaskStatistic.setVoiceAgainInfo(voiceAgainInfo);
//璁板綍鍐嶆闅忚鐭俊璇︽儏
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;
}
@@ -3285,6 +3458,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鍑洪櫌浜烘璇︽儏
+ serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
serviceSubtaskStatistic.setJoyCount(0);
serviceSubtaskStatistic.setJoyAllCount(0);
for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
@@ -3325,13 +3500,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 +3532,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")) {
@@ -3388,6 +3563,8 @@
serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
//鍑洪櫌浜烘
serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+ //鍑洪櫌浜烘璇︽儏
+ serviceSubtaskStatistic.setDischargeCountInfo(serviceSubtaskList);
serviceSubtaskStatistic.setJoyCount(0);
serviceSubtaskStatistic.setJoyAllCount(0);
@@ -3404,6 +3581,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());
@@ -3417,25 +3638,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();
@@ -3443,31 +3670,43 @@
} 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);
+ manualInfo.add(serviceSubtask);
}
- if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+ 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 && serviceSubtask.getPreachform().equals("5")) {
+ 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();
@@ -3475,22 +3714,66 @@
} 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);
+ manualAgainInfo.add(serviceSubtask);
}
- if (serviceSubtask.getSendstate() != null && serviceSubtask.getPreachform().equals("4")) {
+ //鍐嶆闅忚璇煶(缁熻涓嶆墽琛�)
+ 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 && serviceSubtask.getPreachform().equals("5")) {
+ 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;
}
@@ -3587,7 +3870,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);
@@ -3865,13 +4149,18 @@
serviceSubtaskPreachform1.setRemark(remark);
serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(serviceSubtaskPreachform1);
+
//濡傛灉褰撳墠鐨刾reachform宸茬粡鏄渶鍚庝竴涓簡锛岄偅鐩存帴灏唖erviceSubtask鐨剆endstate鐘舵�佹敼鎴�5灏辫浜�(鍏ㄥけ璐ヤ簡)
if (serviceSubtaskPreachform1.getSort() == spSize.size() && failSendstate.equals("4")) {
serviceSubtask.setCurrentPreachform(preachform);
serviceSubtask.setSendstate(5L);
- serviceSubtask.setRemark("鎵�鏈夊彂閫佹柟寮忓潎鏈幏鍙栫粨鏋滐紝浠诲姟澶辫触");
+ serviceSubtask.setRemark(remark + ";鎵�鏈夊彂閫佹柟寮忓潎鏈幏鍙栫粨鏋滐紝浠诲姟澶辫触");
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
return true;
+ } else {
+ //鍔犲叆鐩墠琛ュ伩閲岀殑 remark
+ serviceSubtask.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + "," + remark : remark);
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
}
}
@@ -4170,6 +4459,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