From 7191c6d38f03f2e1baf39f959227ce9c038e4e96 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 十一月 2026 14:39:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261012

---
 smartor/src/main/java/com/smartor/service/impl/SvyTaskServiceImpl.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

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..0d1e1ef 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskServiceImpl.java
@@ -18,6 +18,17 @@
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.template.domain.SvyLibTemplateScript;
+import com.ruoyi.template.domain.SvyLibTemplateScriptVO;
+import com.ruoyi.template.domain.SvyLibTemplateTargetoption;
+import com.smartor.domain.SvyTask;
+import com.smartor.domain.SvyTaskSingle;
+import com.ruoyi.template.mapper.SvyLibTemplateScriptMapper;
+import com.ruoyi.template.mapper.SvyLibTemplateTargetoptionMapper;
+import com.smartor.mapper.SvyTaskMapper;
+import com.smartor.mapper.SvyTaskSingleMapper;
+import com.ruoyi.common.core.domain.entity.PatArchive;
+import com.ruoyi.patarchive.mapper.PatArchiveMapper;
 /**
  * 缁煎悎闂嵎浠诲姟锛堜换鍔★級Service涓氬姟灞傚鐞�
  *
@@ -169,8 +180,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