From cad7a5518224ca88e8a11eba7d8a1dd92f160d42 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 14 十月 2026 14:42:41 +0800
Subject: [PATCH] 【丽水】patItemCount 随访系统内,登录时如该用户有超时任务,弹窗提醒用户,超时任务条数,去完成(查询条件为待随访-超时)

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java
index 706566b..f96a3d0 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java
@@ -109,7 +109,8 @@
                 }
             }
         }
-        Collections.sort(serviceSubtaskDetailSET, Comparator.comparingLong(ServiceSubtaskDetail::getTemplatequestionnum));
+        Collections.sort(serviceSubtaskDetailSET,
+                Comparator.comparing(ServiceSubtaskDetail::getTemplatequestionnum, Comparator.nullsLast(Long::compareTo)));
         map1.put("filteredDetails", serviceSubtaskDetailSET);
 
         map1.put("voice", "");
@@ -129,12 +130,17 @@
         return map;
     }
 
-    /**
-     * 鏂板璇煶浠诲姟鍛煎彨鏄庣粏
-     *
-     * @param serviceSubtaskDetail 璇煶浠诲姟鍛煎彨鏄庣粏
-     * @return 缁撴灉
-     */
+    @Override
+    public List<Map<String, Object>> getServiceSubtaskDetails(ServiceSubtaskDetailVO serviceSubtaskDetailVO) {
+        List<Map<String, Object>> serviceSubtaskDetails = ServiceSubtaskDetailMapper.getServiceSubtaskDetails(serviceSubtaskDetailVO);
+        return serviceSubtaskDetails;
+    }
+        /**
+         * 鏂板璇煶浠诲姟鍛煎彨鏄庣粏
+         *
+         * @param serviceSubtaskDetail 璇煶浠诲姟鍛煎彨鏄庣粏
+         * @return 缁撴灉
+         */
     @Override
     public int insertServiceSubtaskDetail(ServiceSubtaskDetail serviceSubtaskDetail) {
         serviceSubtaskDetail.setCreateTime(DateUtils.getNowDate());

--
Gitblit v1.9.3