From afb277a81e060c6275f11e9f9f102b5dcfd80a72 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 27 六月 2024 09:46:05 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java |   89 +++++++++++++++++++++++++++-----------------
 1 files changed, 54 insertions(+), 35 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
index 55c43c6..55016ea 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
@@ -149,59 +149,43 @@
         if (svyLibTemplate.getIsoperation() != null && svyLibTemplate.getIsoperation() == 1) {
             //鏂板
             svyLibTemplate.setCreateTime(DateUtils.getNowDate());
-            i = svyLibTemplateMapper.insertSvyLibTemplate(svyLibTemplate);
+            svyLibTemplateMapper.insertSvyLibTemplate(svyLibTemplate);
         } else if (svyLibTemplate.getIsoperation() != null && svyLibTemplate.getIsoperation() == 2) {
             //淇敼
             svyLibTemplate.setUpdateTime(DateUtils.getNowDate());
-            i = svyLibTemplateMapper.updateSvyLibTemplate(svyLibTemplate);
+            svyLibTemplateMapper.updateSvyLibTemplate(svyLibTemplate);
         } else if (svyLibTemplate.getIsoperation() != null && svyLibTemplate.getIsoperation() == 3) {
             //鍒犻櫎
-            i = svyLibTemplateMapper.deleteSvyLibTemplateBySvyid(svyLibTemplate.getSvyid());
-
+            svyLibTemplateMapper.deleteSvyLibTemplateBySvyid(svyLibTemplate.getSvyid());
         }
+        i = svyLibTemplate.getSvyid().intValue();
 
         //澶勭悊棰樼洰
         if (CollectionUtils.isNotEmpty(svyLibTemplate.getSvyLibScripts())) {
             for (SvyLibTemplateScript svyLibScript : svyLibTemplate.getSvyLibScripts()) {
-//                SvyLibTemplateScript svyLibTemplateScript = DtoConversionUtils.sourceToTarget(svyLibScript, SvyLibTemplateScript.class);
                 //瀵归鐩繘琛屽鐞�
-                if (svyLibScript.getIsoperation() != null && svyLibScript.getIsoperation() == 1) {
-                    //鏂板
-                    svyLibScript.setSvyid(svyLibTemplate.getSvyid());
-                    svyLibScript.setId(null);
-                    svyLibScript.setCreateTime(new Date());
-                    svyLibTemplateScriptMapper.insertSvyLibTemplateScript(svyLibScript);
-
-                } else if (svyLibScript.getIsoperation() != null && svyLibScript.getIsoperation() == 2) {
-                    //淇敼
-                    svyLibScript.setSvyid(svyLibTemplate.getSvyid());
-                    svyLibScript.setUpdateTime(new Date());
-                    svyLibTemplateScriptMapper.updateSvyLibTemplateScript(svyLibScript);
-                } else if (svyLibScript.getIsoperation() != null && svyLibScript.getIsoperation() == 3) {
-                    svyLibTemplateScriptMapper.deleteSvyLibTemplateScriptByTopicid(svyLibScript.getId());
+                if (svyLibScript.getIsoperation() != null) {
+                    //闂鐨勬搷浣滀笉涓虹┖
+                    scriptHandle(svyLibTemplate.getSvyid(), svyLibScript, svyLibScript.getIsoperation());
+                } else if (svyLibScript.getIsoperation() == null && svyLibTemplate.getIsoperation() != null) {
+                    //妯℃澘鐨勬搷浣滀笉涓虹┖
+                    scriptHandle(svyLibTemplate.getSvyid(), svyLibScript, svyLibTemplate.getIsoperation());
                 }
-
                 //瀵归鐩�夐」杩涜澶勭悊
                 if (CollectionUtils.isNotEmpty(svyLibScript.getSvyLibTemplateTargetoptions())) {
                     for (SvyLibTemplateTargetoption svyLibTemplateTargetoption : svyLibScript.getSvyLibTemplateTargetoptions()) {
-                        if (svyLibTemplateTargetoption.getIsoperation() != null && svyLibTemplateTargetoption.getIsoperation() == 1) {
-                            //鏂板
-                            svyLibTemplateTargetoption.setScriptid(svyLibScript.getId());
-                            svyLibTemplateTargetoption.setCreateTime(new Date());
-                            svyLibTemplateTargetoptionMapper.insertSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
-                        } else if (svyLibTemplateTargetoption.getIsoperation() != null && svyLibTemplateTargetoption.getIsoperation() == 2) {
-                            //淇敼
-                            svyLibTemplateTargetoption.setScriptid(svyLibScript.getId());
-                            svyLibTemplateTargetoption.setUpdateTime(new Date());
-                            svyLibTemplateTargetoptionMapper.updateSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
-                        } else if (svyLibTemplateTargetoption.getIsoperation() != null && svyLibTemplateTargetoption.getIsoperation() == 3) {
-                            //鍒犻櫎
-                            svyLibTemplateTargetoptionMapper.deleteSvyLibTemplateTargetoptionById(svyLibTemplateTargetoption.getId());
+                        if (svyLibTemplateTargetoption.getIsoperation() != null) {
+                            //閫夐�夐」鐨勬搷浣滀笉涓虹┖
+                            optionHandle(svyLibTemplateTargetoption, svyLibScript.getId(), svyLibTemplateTargetoption.getIsoperation());
+                        } else if (svyLibTemplateTargetoption.getIsoperation() == null && svyLibScript.getIsoperation() != null) {
+                            //闂鐨勬搷浣滀笉涓虹┖
+                            optionHandle(svyLibTemplateTargetoption, svyLibScript.getId(), svyLibScript.getIsoperation());
+                        } else if (svyLibTemplateTargetoption.getIsoperation() == null && svyLibScript.getIsoperation() == null && svyLibTemplate.getIsoperation() != null) {
+                            //妯℃澘鐨勬搷浣滀笉涓虹┖
+                            optionHandle(svyLibTemplateTargetoption, svyLibScript.getId(), svyLibTemplate.getIsoperation());
                         }
                     }
-
                 }
-
             }
         }
 
@@ -254,4 +238,39 @@
     public int deleteSvyLibTemplateBySvyid(Long svyid) {
         return svyLibTemplateMapper.deleteSvyLibTemplateBySvyid(svyid);
     }
+
+    private void scriptHandle(Long svyid, SvyLibTemplateScript svyLibScript, Integer isoperation) {
+        if (isoperation == 1) {
+            //鏂板
+            svyLibScript.setSvyid(svyid);
+            svyLibScript.setId(null);
+            svyLibScript.setCreateTime(new Date());
+            svyLibTemplateScriptMapper.insertSvyLibTemplateScript(svyLibScript);
+
+        } else if (isoperation == 2) {
+            //淇敼
+            svyLibScript.setSvyid(svyid);
+            svyLibScript.setUpdateTime(new Date());
+            svyLibTemplateScriptMapper.updateSvyLibTemplateScript(svyLibScript);
+        } else if (isoperation == 3) {
+            svyLibTemplateScriptMapper.deleteSvyLibTemplateScriptByTopicid(svyLibScript.getId());
+        }
+    }
+
+    private void optionHandle(SvyLibTemplateTargetoption svyLibTemplateTargetoption, Long scriptId, Integer isoperation) {
+        if (isoperation == 1) {
+            //鏂板
+            svyLibTemplateTargetoption.setScriptid(scriptId);
+            svyLibTemplateTargetoption.setCreateTime(new Date());
+            svyLibTemplateTargetoptionMapper.insertSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
+        } else if (isoperation == 2) {
+            //淇敼
+            svyLibTemplateTargetoption.setScriptid(scriptId);
+            svyLibTemplateTargetoption.setUpdateTime(new Date());
+            svyLibTemplateTargetoptionMapper.updateSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
+        } else if (isoperation == 3) {
+            //鍒犻櫎
+            svyLibTemplateTargetoptionMapper.deleteSvyLibTemplateTargetoptionById(svyLibTemplateTargetoption.getId());
+        }
+    }
 }

--
Gitblit v1.9.3