From 37e23ae4323114564dadbacf75449b75ad957bbf Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 13 七月 2026 16:24:01 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 b51a0a3..5d7cd97 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -410,6 +410,13 @@
serviceSubtaskRes.setSendstateView(1L);
if (serviceSubtaskRes.getSendstate() == 6) serviceSubtaskRes.setSendstateView(2L);
if (serviceSubtaskRes.getSendstate() == 4) serviceSubtaskRes.setSendstateView(3L);
+ // 濉厖褰撳墠琛ュ伩
+ if (StringUtils.isEmpty(serviceSubtask.getCurrentPreachform())){
+ if(StringUtils.isNotEmpty(serviceSubtask.getPreachform())){
+ //榛樿鍙栫涓�涓�
+ serviceSubtaskRes.setCurrentPreachform(serviceSubtask.getPreachform().split(",")[0]);
+ }
+ }
serviceSubtaskResList.add(serviceSubtaskRes);
}
return serviceSubtaskResList;
@@ -3169,6 +3176,18 @@
serviceSubtaskStatistic.setFollowUpNeeded(serviceSubtaskStatistic.getFollowUpNeeded() + 1L);
}
+ //棣栨鍑洪櫌闅忚-缁熻鍐嶆鎺ㄩ�佹暟閲�
+ if (serviceSubtask.getVisitCount() != null && serviceSubtask.getVisitCount() > 1) {
+ //鍐嶆搴旈殢璁�
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
+ serviceSubtaskStatistic.setNeedFollowUpAgain(serviceSubtaskStatistic.getNeedFollowUpAgain() + 1L);
+ }
+ //鍐嶆闅忚瀹屾垚
+ if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 6) {
+ serviceSubtaskStatistic.setFollowUpSuccessAgain(serviceSubtaskStatistic.getFollowUpSuccessAgain() + 1L);
+ }
+ }
+
//棣栨鍑洪櫌闅忚
if (serviceSubtask.getVisitCount() != null && serviceSubtask.getVisitCount() == 1) {
//棣栨搴旈殢璁�
@@ -4579,6 +4598,12 @@
}
@Override
+ public List<ServiceSubtask> gethelibraryCountHyperlink(HeLibraryCountVO heLibraryCountVO){
+ List<ServiceSubtask> serviceSubtasks = serviceSubtaskMapper.gethelibraryCountHyperlink(heLibraryCountVO);
+ return serviceSubtasks;
+ }
+
+ @Override
public Map<String, Object> smsSubTask(Long subid) {
log.info("smsSubTask鐨勫叆鍙備负锛歿}", subid);
Map<String, Object> resultMap = new HashMap<>();
--
Gitblit v1.9.3