From 4cccaf33dd171c20b6c262467f24706e3d175aab Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 25 二月 2025 18:15:09 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 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 d22dc99..3a3416b 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -69,6 +69,9 @@
     private IServiceTaskdiagService serviceTaskdiagService;
 
     @Autowired
+    private IServiceTaskoperService serviceTaskoperService;
+
+    @Autowired
     private RedisCache redisCache;
 
     @Autowired
@@ -383,7 +386,27 @@
             if (serviceTaskVO.getLongTask() == 1L) {
                 serviceTask.setSendState(2L);
                 serviceTaskService.insertServiceTask(serviceTask);
-                if (StringUtils.isEmpty(serviceTaskVO.getIcd10code())) {
+                if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
+                    ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
+                    serviceTaskdiag.setTaskId(serviceTask.getTaskid());
+                    serviceTaskdiag.setTaskName(serviceTask.getTaskName());
+                    serviceTaskdiag.setLongtask(1L);
+                    serviceTaskdiag.setGuid(serviceTask.getGuid());
+                    serviceTaskdiag.setOrgid(serviceTask.getOrgid());
+                    serviceTaskdiag.setCreateTime(new Date());
+                    serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
+                } else if (StringUtils.isEmpty(serviceTaskVO.getOpcode())) {
+                    ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
+                    serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
+                    serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
+                    serviceTaskoper.setTaskId(serviceTask.getTaskid());
+                    serviceTaskoper.setTaskName(serviceTask.getTaskName());
+                    serviceTaskoper.setLongtask(1L);
+                    serviceTaskoper.setGuid(serviceTask.getGuid());
+                    serviceTaskoper.setOrgid(serviceTask.getOrgid());
+                    serviceTaskoper.setCreateTime(new Date());
+                    serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+                } else {
                     ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
                     serviceTaskdept.setTaskId(serviceTask.getTaskid());
                     serviceTaskdept.setTaskName(serviceTask.getTaskName());
@@ -410,16 +433,6 @@
                             serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                         }
                     }
-
-                } else {
-                    ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
-                    serviceTaskdiag.setTaskId(serviceTask.getTaskid());
-                    serviceTaskdiag.setTaskName(serviceTask.getTaskName());
-                    serviceTaskdiag.setLongtask(1L);
-                    serviceTaskdiag.setGuid(serviceTask.getGuid());
-                    serviceTaskdiag.setOrgid(serviceTask.getOrgid());
-                    if (serviceTaskVO.getLongTask() == 1) serviceTaskdiag.setLongtask(1L);
-                    serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
 
                 }
                 if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1 && serviceTaskVO.getPatCycle() == 0L) {
@@ -1889,6 +1902,7 @@
             serviceSubtask.setRemark("鐢佃瘽鎷ㄦ墦宸插畬鎴�");
             serviceSubtask.setSendstate(6L);
             serviceSubtask.setId(Long.valueOf(phoneCallRecordVO.getTaskid()));
+            serviceSubtask.setFinishtime(new Date());
             serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
             //涓嬭浇鏂囦欢
             ftpService.downloadFolder("/" + LocalDate.now().toString(), profile + "/upload/vadio/voice/" + LocalDate.now().toString());
@@ -1901,6 +1915,7 @@
             serviceSubtask.setRemark("鐢佃瘽鎺ラ�氭垚鍔燂紝鎮h�呮嫆缁濋殢璁�");
             serviceSubtask.setId(Long.valueOf(phoneCallRecordVO.getTaskid()));
             serviceSubtask.setSendstate(6L);
+            serviceSubtask.setFinishtime(new Date());
             serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
             int startIndex = phoneCallRecordVO.getRecord_path().indexOf("voice") + "voice".length() + 1;  // 鍔�1鏄烦杩�/绗﹀彿
             int endIndex = phoneCallRecordVO.getRecord_path().lastIndexOf("/");

--
Gitblit v1.9.3