From b57304d9917beab4671442a0018c1c3a2d681640 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 23 四月 2026 15:09:09 +0800
Subject: [PATCH] 提交

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |   17 +++++++++++++++++
 1 files changed, 17 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 5805099..53b97f1 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -2461,11 +2461,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);
@@ -2685,6 +2687,8 @@
             serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
             //鍑洪櫌浜烘
             serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+            //鏃犻渶闅忚璇︽儏
+            List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
             //璁板綍杩囨护鎮ｈ�呰鎯�
             List<ServiceSubtask> filterServiceSubtasks = new ArrayList<>();
             //璁板綍棣栨搴旈殢璁胯鎯�
@@ -2721,6 +2725,7 @@
                 //鏃犻渶闅忚浜烘
                 if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                     serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
+                    nonFollowUpInfo.add(serviceSubtask);
                     if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
                         serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L);
                         filterServiceSubtasks.add(serviceSubtask);
@@ -2899,6 +2904,8 @@
                 }
             }
             serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
+            //璁板綍鏃犻渶闅忚璇︽儏
+            serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
             //璁板綍棣栨搴旈殢璁胯鎯�
             serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
             //璁板綍棣栨寰呴殢璁胯鎯�
@@ -2951,6 +2958,8 @@
         serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
         //鍑洪櫌浜烘
         serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+        //鏃犻渶闅忚璇︽儏
+        List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
         //璁板綍杩囨护鎮ｈ�呰鎯�
         List<ServiceSubtask> filterServiceSubtasks = new ArrayList<>();
         //璁板綍棣栨搴旈殢璁胯鎯�
@@ -2972,6 +2981,7 @@
             //鏃犻渶闅忚浜烘
             if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                 serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
+                nonFollowUpInfo.add(serviceSubtask);
                 if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
                     serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L);
                     filterServiceSubtasks.add(serviceSubtask);
@@ -3077,6 +3087,8 @@
             }
         }
         serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
+        //璁板綍鏃犻渶闅忚璇︽儏
+        serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
         //璁板綍棣栨搴旈殢璁胯鎯�
         serviceSubtaskStatistic.setNeedFollowUpInfo(needFollowUpInfo);
         //璁板綍棣栨寰呴殢璁胯鎯�
@@ -3113,6 +3125,8 @@
         serviceSubtaskStatistic.setDrname(serviceSubtaskList.get(0).getDrname());
         //鍑洪櫌浜烘
         serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
+        //鏃犻渶闅忚璇︽儏
+        List<ServiceSubtask> nonFollowUpInfo = new ArrayList<>();
         //璁板綍杩囨护鎮ｈ�呰鎯�
         List<ServiceSubtask> filterServiceSubtasks = new ArrayList<>();
 
@@ -3135,6 +3149,7 @@
             //鏃犻渶闅忚浜烘
             if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                 serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
+                nonFollowUpInfo.add(serviceSubtask);
                 if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
                     serviceSubtaskStatistic.setFilterCount(serviceSubtaskStatistic.getFilterCount() + 1L);
                     filterServiceSubtasks.add(serviceSubtask);
@@ -3240,6 +3255,8 @@
             }
         }
         serviceSubtaskStatistic.setFilterCountList(filterServiceSubtasks);
+        //璁板綍鏃犻渶闅忚璇︽儏
+        serviceSubtaskStatistic.setNonFollowUpInfo(nonFollowUpInfo);
         //璁板綍鍐嶆搴旈殢璁胯鎯�
         serviceSubtaskStatistic.setNeedFollowUpAgainInfo(needFollowUpAgainInfo);
         //璁板綍鍐嶆寰呴殢璁胯鎯�

--
Gitblit v1.9.3