From 6a58a5a148c27c9ff66901bfbae6e52c1a56b5d2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 04 七月 2024 17:17:53 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/SvyTaskTemplateServiceImpl.java |   75 +++++++++++++++++++++----------------
 1 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskTemplateServiceImpl.java
index a18eb0d..15cf5da 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskTemplateServiceImpl.java
@@ -135,38 +135,15 @@
         if (CollectionUtils.isNotEmpty(svyTaskTemplateVO.getSvyTaskTemplateScriptVOS())) {
             log.error("ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList()鏄惁鏈夋暟鎹搱锛歿}", svyTaskTemplateVO.getSvyTaskTemplateScriptVOS());
             for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : svyTaskTemplateVO.getSvyTaskTemplateScriptVOS()) {
-                if (svyTaskTemplateScriptVO.getIsoperation() != null && svyTaskTemplateScriptVO.getIsoperation() == 1 || svyTaskTemplateScriptVO.getIsoperation() == null && svyTaskTemplateScriptVO.getIsoperation() == 1) {
-                    //鏂板
-                    SvyTaskTemplateScript svyTaskTemplateScript = DtoConversionUtils.sourceToTarget(svyTaskTemplateScriptVO, SvyTaskTemplateScript.class);
-                    svyTaskTemplateScript.setTemplateID(svyTaskTemplate.getId());
-                    svyTaskTemplateScript.setCreateTime(new Date());
-                    svyTaskTemplateScriptMapper.insertSvyTaskTemplateScript(svyTaskTemplateScript);
-                    svyTaskTemplateScript.setIsoperation(1);
-                    //瀵归�夐」鐩繘琛屽鐞�
-                    dealOption(svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions(), svyTaskTemplateScript, svyTaskTemplate.getId());
-
-                } else if (svyTaskTemplateScriptVO.getIsoperation() != null && svyTaskTemplateScriptVO.getIsoperation() == 2) {
-                    //淇敼
-                    SvyTaskTemplateScript svyTaskTemplateScript = DtoConversionUtils.sourceToTarget(svyTaskTemplateScriptVO, SvyTaskTemplateScript.class);
-                    svyTaskTemplateScript.setTemplateID(svyTaskTemplate.getId());
-                    svyTaskTemplateScript.setUpdateTime(new Date());
-                    svyTaskTemplateScriptMapper.updateSvyTaskTemplateScript(svyTaskTemplateScript);
-                    svyTaskTemplateScript.setIsoperation(2);
-                    //瀵归�夐」鐩繘琛屽鐞�
-                    dealOption(svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions(), svyTaskTemplateScript, svyTaskTemplate.getId());
-
-                } else if (svyTaskTemplateScriptVO.getIsoperation() != null && svyTaskTemplateScriptVO.getIsoperation() == 3) {
-                    //鍒犻櫎
-                    if (svyTaskTemplateScriptVO.getID() == null) {
-                        log.info("鍒犻櫎澶辫触,妯℃澘璇濇湳id涓虹┖");
-                    } else {
-                        svyTaskTemplateScriptVO.setUpdateTime(new Date());
-                        svyTaskTemplateScriptMapper.deleteSvyTaskTemplateScriptByID(svyTaskTemplateScriptVO.getID());
-                    }
+                if (svyTaskTemplateScriptVO.getIsoperation() != null) {
+                    SvyTaskTemplateScript svyTaskTemplateScript = scriptHandle(svyTaskTemplate, svyTaskTemplateScriptVO, svyTaskTemplateScriptVO.getIsoperation());
+                    dealOption(svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions(), svyTaskTemplateScript, svyTaskTemplate.getId(), svyTaskTemplateScriptVO.getIsoperation());
+                } else {
+                    SvyTaskTemplateScript svyTaskTemplateScript = scriptHandle(svyTaskTemplate, svyTaskTemplateScriptVO, svyTaskTemplateVO.getIsoperation());
+                    dealOption(svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions(), svyTaskTemplateScript, svyTaskTemplate.getId(), svyTaskTemplateVO.getIsoperation());
                 }
             }
         }
-
         return i;
     }
 
@@ -229,12 +206,44 @@
     }
 
 
-    private void dealOption(List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions, SvyTaskTemplateScript svyTaskTemplateScript, Long tmpID) {
+    private SvyTaskTemplateScript scriptHandle(SvyTaskTemplate svyTaskTemplate, SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, Integer isoperation) {
+        SvyTaskTemplateScript svyTaskTemplateScript = DtoConversionUtils.sourceToTarget(svyTaskTemplateScriptVO, SvyTaskTemplateScript.class);
+        if (isoperation == 1) {
+            //鏂板
+            svyTaskTemplateScript.setTemplateID(svyTaskTemplate.getId());
+            svyTaskTemplateScript.setCreateTime(new Date());
+            svyTaskTemplateScriptMapper.insertSvyTaskTemplateScript(svyTaskTemplateScript);
+            svyTaskTemplateScript.setIsoperation(1);
+        } else if (isoperation == 2) {
+            //淇敼
+            svyTaskTemplateScript.setTemplateID(svyTaskTemplate.getId());
+            svyTaskTemplateScript.setUpdateTime(new Date());
+            svyTaskTemplateScriptMapper.updateSvyTaskTemplateScript(svyTaskTemplateScript);
+            svyTaskTemplateScript.setIsoperation(2);
+        } else if (isoperation == 3) {
+            if (svyTaskTemplateScriptVO.getID() == null) {
+                log.info("鍒犻櫎澶辫触,妯℃澘璇濇湳id涓虹┖");
+            } else {
+                svyTaskTemplateScriptVO.setUpdateTime(new Date());
+                svyTaskTemplateScriptMapper.deleteSvyTaskTemplateScriptByID(svyTaskTemplateScriptVO.getID());
+            }
+        }
+        return svyTaskTemplateScript;
+    }
+
+    private void dealOption(List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions, SvyTaskTemplateScript svyTaskTemplateScript, Long tmpID, Integer isoperation) {
         log.info("svyTaskTemplateScript鐨勫�间负锛歿}", svyTaskTemplateScript);
+        Integer lsIsoperation = isoperation;
         //瀵规ā鏉挎寚鏍囬�夐」杩涜澶勭悊
         if (CollectionUtils.isNotEmpty(svyTaskTemplateTargetoptions)) {
             for (SvyTaskTemplateTargetoption svyTaskTemplateTargetoption : svyTaskTemplateTargetoptions) {
-                if (svyTaskTemplateTargetoption.getIsoperation() != null && svyTaskTemplateTargetoption.getIsoperation() == 1 || svyTaskTemplateTargetoption.getIsoperation() == null && svyTaskTemplateTargetoption.getIsoperation() == 1) {
+                // 濡傛灉閫夐」鏈韩鐨刼peration涓嶄负绌猴紝灏辩敤鑷繁鐨�;涓嶇劧锛屽氨鐢ㄤ紶杩囨潵鐨�
+                if (svyTaskTemplateTargetoption.getIsoperation() != null) {
+                    isoperation = svyTaskTemplateTargetoption.getIsoperation();
+                } else {
+                    isoperation = lsIsoperation;
+                }
+                if (isoperation == 1) {
                     //鏂板
                     svyTaskTemplateTargetoption.setTemplateID(tmpID);
                     svyTaskTemplateTargetoption.setScriptid(svyTaskTemplateScript.getID());
@@ -243,7 +252,7 @@
                     if (CollectionUtils.isNotEmpty(svyTaskTemplateTargetoption.getNodynamiccruxs()))
                         svyTaskTemplateTargetoption.setNodynamiccruxsJson(JSON.toJSONString(svyTaskTemplateTargetoption.getNodynamiccruxs()));
                     svyTaskTemplateTargetoptionMapper.insertSvyTaskTemplateTargetoption(svyTaskTemplateTargetoption);
-                } else if (svyTaskTemplateTargetoption.getIsoperation() != null && svyTaskTemplateTargetoption.getIsoperation() == 2) {
+                } else if (isoperation == 2) {
                     //淇敼
                     svyTaskTemplateTargetoption.setTemplateID(tmpID);
                     svyTaskTemplateTargetoption.setScriptid(svyTaskTemplateScript.getID());
@@ -252,7 +261,7 @@
                     if (CollectionUtils.isNotEmpty(svyTaskTemplateTargetoption.getNodynamiccruxs()))
                         svyTaskTemplateTargetoption.setNodynamiccruxsJson(JSON.toJSONString(svyTaskTemplateTargetoption.getNodynamiccruxs()));
                     svyTaskTemplateTargetoptionMapper.updateSvyTaskTemplateTargetoption(svyTaskTemplateTargetoption);
-                } else if (svyTaskTemplateTargetoption.getIsoperation() != null && svyTaskTemplateTargetoption.getIsoperation() == 3) {
+                } else if (isoperation == 3) {
                     //鍒犻櫎
                     if (svyTaskTemplateTargetoption.getId() == null) {
                         log.info("鍒犻櫎澶辫触,妯℃澘鎸囨爣閫夐」id涓虹┖");

--
Gitblit v1.9.3