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/IvrTaskTemplateServiceImpl.java |   78 ++++++++++++++++++++++-----------------
 1 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java
index a4ca342..ef56751 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java
@@ -91,45 +91,22 @@
         }
         log.info("鏂板闅忚浠诲姟闅忚妯℃澘鐨刬d涓猴細{}", ivrTaskTemplate.getID());
 
-
         //瀵规ā鏉胯瘽鏈拰閫夐」杩涜澶勭悊锛堣瘽鏈〃涓庢寚鏍囪〃杩涜鍚堝苟浜嗭紝锛�
         if (CollectionUtils.isNotEmpty(ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList())) {
             log.error("ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList()鏄惁鏈夋暟鎹搱锛歿}", ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList());
             for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList()) {
-                if (ivrTaskTemplateScriptVO.getIsoperation() != null && ivrTaskTemplateScriptVO.getIsoperation() == 1 || ivrTaskTemplateScriptVO.getIsoperation() == null && ivrTaskTemplateVO.getIsoperation() == 1) {
-                    //鏂板
-                    IvrTaskTemplateScript ivrTaskTemplateScript = DtoConversionUtils.sourceToTarget(ivrTaskTemplateScriptVO, IvrTaskTemplateScript.class);
-                    ivrTaskTemplateScript.setTemplateID(ivrTaskTemplate.getID());
-                    ivrTaskTemplateScript.setCreateTime(new Date());
-                    ivrTaskTemplateScriptMapper.insertIvrTaskTemplateScript(ivrTaskTemplateScript);
-                    ivrTaskTemplateScript.setIsoperation(1);
-                    //瀵归�夐」鐩繘琛屽鐞�
-                    dealOption(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList(), ivrTaskTemplateScript, ivrTaskTemplate.getID());
-
-                } else if (ivrTaskTemplateScriptVO.getIsoperation() != null && ivrTaskTemplateScriptVO.getIsoperation() == 2) {
-                    //淇敼
-                    IvrTaskTemplateScript ivrTaskTemplateScript = DtoConversionUtils.sourceToTarget(ivrTaskTemplateScriptVO, IvrTaskTemplateScript.class);
-                    ivrTaskTemplateScript.setTemplateID(ivrTaskTemplate.getID());
-                    ivrTaskTemplateScript.setUpdateTime(new Date());
-                    ivrTaskTemplateScriptMapper.updateIvrTaskTemplateScript(ivrTaskTemplateScript);
-                    ivrTaskTemplateScript.setIsoperation(2);
-                    //瀵归�夐」鐩繘琛屽鐞�
-                    dealOption(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList(), ivrTaskTemplateScript, ivrTaskTemplate.getID());
-
-                } else if (ivrTaskTemplateScriptVO.getIsoperation() != null && ivrTaskTemplateScriptVO.getIsoperation() == 3) {
-                    //鍒犻櫎
-                    if (ivrTaskTemplateScriptVO.getID() == null) {
-                        log.info("鍒犻櫎澶辫触,妯℃澘璇濇湳id涓虹┖");
-                    } else {
-                        ivrTaskTemplateScriptVO.setUpdateTime(new Date());
-                        ivrTaskTemplateScriptMapper.deleteIvrTaskTemplateScriptByID(ivrTaskTemplateScriptVO.getID());
-                    }
+                if (ivrTaskTemplateScriptVO.getIsoperation() != null) {
+                    IvrTaskTemplateScript ivrTaskTemplateScript = scriptHandle(ivrTaskTemplate, ivrTaskTemplateScriptVO, ivrTaskTemplateScriptVO.getIsoperation());
+                    dealOption(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList(), ivrTaskTemplateScript, ivrTaskTemplate.getID(), ivrTaskTemplateScriptVO.getIsoperation());
+                } else {
+                    IvrTaskTemplateScript ivrTaskTemplateScript = scriptHandle(ivrTaskTemplate, ivrTaskTemplateScriptVO, ivrTaskTemplateVO.getIsoperation());
+                    dealOption(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList(), ivrTaskTemplateScript, ivrTaskTemplate.getID(), ivrTaskTemplateVO.getIsoperation());
                 }
             }
         }
-
         return ivrTaskTemplate.getID().intValue();
     }
+
 
     /**
      * 淇敼闅忚浠诲姟闅忚妯℃澘搴�
@@ -229,13 +206,46 @@
         return templateVO;
     }
 
+    private IvrTaskTemplateScript scriptHandle(IvrTaskTemplate ivrTaskTemplate, IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO, Integer isoperation) {
+        IvrTaskTemplateScript ivrTaskTemplateScript = DtoConversionUtils.sourceToTarget(ivrTaskTemplateScriptVO, IvrTaskTemplateScript.class);
 
-    private void dealOption(List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptionList, IvrTaskTemplateScript ivrTaskTemplateScript, Long tmpID) {
+        if (isoperation == 1) {
+            //鏂板
+            ivrTaskTemplateScript.setTemplateID(ivrTaskTemplate.getID());
+            ivrTaskTemplateScript.setCreateTime(new Date());
+            ivrTaskTemplateScriptMapper.insertIvrTaskTemplateScript(ivrTaskTemplateScript);
+            ivrTaskTemplateScript.setIsoperation(1);
+        } else if (isoperation == 2) {
+            //淇敼
+            ivrTaskTemplateScript.setTemplateID(ivrTaskTemplate.getID());
+            ivrTaskTemplateScript.setUpdateTime(new Date());
+            ivrTaskTemplateScriptMapper.updateIvrTaskTemplateScript(ivrTaskTemplateScript);
+            ivrTaskTemplateScript.setIsoperation(2);
+
+        } else if (isoperation == 3) {
+            //鍒犻櫎
+            if (ivrTaskTemplateScriptVO.getID() == null) {
+                log.info("鍒犻櫎澶辫触,妯℃澘璇濇湳id涓虹┖");
+            } else {
+                ivrTaskTemplateScriptVO.setUpdateTime(new Date());
+                ivrTaskTemplateScriptMapper.deleteIvrTaskTemplateScriptByID(ivrTaskTemplateScriptVO.getID());
+            }
+        }
+        return ivrTaskTemplateScript;
+    }
+
+    private void dealOption(List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptionList, IvrTaskTemplateScript ivrTaskTemplateScript, Long tmpID, Integer isoperation) {
         log.info("ivrLibaTemplateScript鐨勫�间负锛歿}", ivrTaskTemplateScript);
+        Integer lsisoperation = isoperation;
         //瀵规ā鏉挎寚鏍囬�夐」杩涜澶勭悊
         if (CollectionUtils.isNotEmpty(ivrTaskTemplateTargetoptionList)) {
             for (IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption : ivrTaskTemplateTargetoptionList) {
-                if (ivrTaskTemplateTargetoption.getIsoperation() != null && ivrTaskTemplateTargetoption.getIsoperation() == 1 || ivrTaskTemplateTargetoption.getIsoperation() == null && ivrTaskTemplateScript.getIsoperation() == 1) {
+                if (ivrTaskTemplateTargetoption.getIsoperation() != null) {
+                    isoperation = ivrTaskTemplateTargetoption.getIsoperation();
+                } else {
+                    isoperation = lsisoperation;
+                }
+                if (isoperation == 1) {
                     //鏂板
                     ivrTaskTemplateTargetoption.setTemplateID(tmpID);
                     ivrTaskTemplateTargetoption.setScriptid(ivrTaskTemplateScript.getID());
@@ -244,7 +254,7 @@
                     if (CollectionUtils.isNotEmpty(ivrTaskTemplateTargetoption.getNodynamiccruxs()))
                         ivrTaskTemplateTargetoption.setNodynamiccruxsJson(JSON.toJSONString(ivrTaskTemplateTargetoption.getNodynamiccruxs()));
                     ivrTaskTemplateTargetoptionMapper.insertIvrTaskTemplateTargetoption(ivrTaskTemplateTargetoption);
-                } else if (ivrTaskTemplateTargetoption.getIsoperation() != null && ivrTaskTemplateTargetoption.getIsoperation() == 2) {
+                } else if (isoperation == 2) {
                     //淇敼
                     ivrTaskTemplateTargetoption.setTemplateID(tmpID);
                     ivrTaskTemplateTargetoption.setScriptid(ivrTaskTemplateScript.getID());
@@ -253,7 +263,7 @@
                     if (CollectionUtils.isNotEmpty(ivrTaskTemplateTargetoption.getNodynamiccruxs()))
                         ivrTaskTemplateTargetoption.setNodynamiccruxsJson(JSON.toJSONString(ivrTaskTemplateTargetoption.getNodynamiccruxs()));
                     ivrTaskTemplateTargetoptionMapper.updateIvrTaskTemplateTargetoption(ivrTaskTemplateTargetoption);
-                } else if (ivrTaskTemplateTargetoption.getIsoperation() != null && ivrTaskTemplateTargetoption.getIsoperation() == 3) {
+                } else if (isoperation == 3) {
                     //鍒犻櫎
                     if (ivrTaskTemplateTargetoption.getId() == null) {
                         log.info("鍒犻櫎澶辫触,妯℃澘鎸囨爣閫夐」id涓虹┖");

--
Gitblit v1.9.3