From 11d763612e5dbcc5d2365683b8c8eb6c5b525653 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 18 十二月 2025 14:38:56 +0800
Subject: [PATCH] 【丽水】增加queryTaskByCondition空指针异常判断
---
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
index e986244..30bdff6 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -246,6 +246,9 @@
// }
//閫氳繃浠诲姟ID鑾峰彇妯℃澘ID
ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
+ if (serviceTask == null) {
+ throw new BaseException("浠诲姟涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎锛宼askid: " + taskid);
+ }
List info = new ArrayList();
if (serviceTask.getType().equals("1")) {
//闅忚
@@ -263,9 +266,10 @@
ServiceSubtask ss = new ServiceSubtask();
ss.setTaskid(taskid);
ss.setPatid(patid);
- Integer integer = serviceSubtaskMapper.selectSendstateByCondition(ss);
- if (integer != null && integer != 6) {
- ss.setSendstate(1L);
+ ss.setSendstate(3L);
+ List<Integer> integer = serviceSubtaskMapper.selectSendstateByCondition(ss);
+ if (integer != null) {
+ ss.setSendstate(6L);
serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
}
}
@@ -299,6 +303,9 @@
public Map<String, Object> getScriptByCondition(Long taskid, String zyserialnum, String mzserialnum, String tsserialnum) {
//閫氳繃浠诲姟ID鑾峰彇妯℃澘ID
ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
+ if (serviceTask == null) {
+ throw new BaseException("浠诲姟涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎锛宼askid: " + taskid);
+ }
//閫氳繃妯℃澘ID鑾峰彇闂淇℃伅
SvyTaskTemplateScript svyTaskTemplateScript = new SvyTaskTemplateScript();
svyTaskTemplateScript.setTemplateID(Long.valueOf(serviceTask.getTemplateid()));
@@ -507,10 +514,11 @@
}
List<Map<String, String>> mapList = new ArrayList<>();
- for (Map<String, String> map : ivrTaskMap.values()) {
- mapList.add(map);
+ if (ivrTaskMap != null) {
+ for (Map<String, String> map : ivrTaskMap.values()) {
+ mapList.add(map);
+ }
}
-
//灏嗘ā鏉块棶棰樿瘽鏈噷鐨勯�氶厤绗︽浛鎹�
for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : svyTaskTemplateScriptVOS) {
if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getScriptContent())) {
@@ -603,8 +611,9 @@
ServiceSubtask serviceSubtask = new ServiceSubtask();
serviceSubtask.setTaskid(taskid);
serviceSubtask.setPatid(patid);
- Integer integer = serviceSubtaskMapper.selectSendstateByCondition(serviceSubtask);
- if (integer == 3) {
+ serviceSubtask.setSendstate(3L);
+ List<Integer> integer = serviceSubtaskMapper.selectSendstateByCondition(serviceSubtask);
+ if (integer != null) {
serviceSubtask.setResult("瀹屾垚");
serviceSubtask.setFinishtime(new Date());
serviceSubtask.setSendstate(6L);
--
Gitblit v1.9.3