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/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