From babb070a354a8ecf1473ff882e0dc8735ab59912 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期二, 10 六月 2025 15:37:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/service/impl/SvyTaskServiceImpl.java | 4 ++--
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 4 ++--
2 files changed, 4 insertions(+), 4 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 3137d61..d560ef9 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -224,8 +224,8 @@
Integer integer = serviceSubtaskMapper.selectSendstateByCondition(ss);
if (integer != null && integer != 6) {
ss.setSendstate(1L);
- ss.setResult("success");
- ss.setFinishtime(new Date());
+// ss.setResult("success");
+// ss.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskServiceImpl.java
index f900a33..52e8bcc 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskServiceImpl.java
@@ -169,8 +169,8 @@
SvyTaskSingle svyTaskSingle = new SvyTaskSingle();
svyTaskSingle.setTaskid(taskid);
svyTaskSingle.setPatid(patid);
- svyTaskSingle.setResult("success");
- svyTaskSingle.setFinishtime(new Date());
+// svyTaskSingle.setResult("success");
+// svyTaskSingle.setFinishtime(new Date());
svyTaskSingleMapper.updateSvyTaskSingle(svyTaskSingle);
return svyLibTemplateScriptVOS;
--
Gitblit v1.9.3