From add1f50fe50a9bbb0fc77d3d0ea3610cce7f60f3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 24 十二月 2025 14:40:19 +0800
Subject: [PATCH] 【市一】 语音电话发送调整 随访时间为空的空指针异常
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 a0e33fe..ec4e34d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -17,6 +17,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -374,7 +375,10 @@
public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO) {
// 鐩存帴璋冪敤鏁版嵁搴撶粺璁℃柟娉曪紝鍦ㄦ暟鎹簱灞傚畬鎴愯仛鍚堣绠�
Map<String, Object> result = serviceSubtaskMapper.countByCondition(serviceSubtaskVO);
-
+ // 澶勭悊绌哄紓甯�
+ if(MapUtils.isEmpty(result)){
+ result = new HashMap<>();
+ }
// 纭繚鎵�鏈� key 閮芥湁鍊硷紝閬垮厤绌烘寚閽堝紓甯�
// MyBatis 鐨� SUM 鍦ㄦ病鏈夊尮閰嶈鏃朵細杩斿洖 null
result.putIfAbsent("wzx", 0);
@@ -2971,6 +2975,11 @@
serviceSubtaskPreachform.setTaskid(taskid);
List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
if (CollectionUtils.isNotEmpty(serviceSubtaskPreachforms)) {
+ //娌℃湁闅忚鏃堕棿鍒欐寜褰撳ぉ鏉ョ畻--涓存椂
+ if (visitTime == null) {
+ visitTime = new Date();
+ }
+
String compensateTime = serviceSubtaskPreachforms.get(0).getCompensateTime();
int hoursToAdd = Integer.valueOf(compensateTime) * 24;
Calendar calendar = Calendar.getInstance();
--
Gitblit v1.9.3