From ac79f032745c975eb77d6fb148ed390f2373559e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 28 十二月 2023 17:58:52 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java
index 655070d..a9a328e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java
@@ -9,6 +9,7 @@
 import com.ruoyi.common.utils.StringUtils;
 import com.smartor.domain.*;
 import com.smartor.mapper.SvyLibTopicoptionMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.catalina.User;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -16,6 +17,7 @@
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.smartor.mapper.SvyLibTopicMapper;
@@ -29,13 +31,14 @@
  * @author ruoyi
  * @date 2023-03-03
  */
+@Slf4j
 @Service
 public class SvyLibTopicServiceImpl implements ISvyLibTopicService {
     @Autowired
     private SvyLibTopicMapper svyLibTopicMapper;
 
-//    @Autowired
-//    private SvyLibTopicoptionMapper svyLibTopicoptionMapper;
+    @Autowired
+    private SvyLibTopicoptionMapper svyLibTopicoptionMapper;
 
     /**
      * 鏌ヨ闂嵎棰樼洰
@@ -56,7 +59,25 @@
      */
     @Override
     public List<SvyLibTopic> selectSvyLibTopicList(SvyLibTopic svyLibTopic) {
-        return svyLibTopicMapper.selectSvyLibTopicList(svyLibTopic);
+        //娣诲姞棰樼洰
+
+        List<SvyLibTopic> svyLibTopics = svyLibTopicMapper.selectSvyLibTopicList(svyLibTopic);
+        //鑾峰彇棰樼洰閫夐」
+
+        for (int j = 0; j < svyLibTopics.size(); j++) {
+            log.info("闂id涓猴細{}", svyLibTopics.get(j).getSvyTopicId());
+            if (svyLibTopics.get(j).getTopictype() != null && svyLibTopics.get(j).getTopictype() == 3 || svyLibTopics.get(j).getSvyTopicId() == null) {
+                //浣滅瓟棰橈紝涓嶉渶瑕侀�夐」
+                continue;
+            } else {
+                SvyLibTopicoption svyLibTopicoption = new SvyLibTopicoption();
+                svyLibTopicoption.setTopicid(svyLibTopics.get(j).getSvyTopicId());
+                List<SvyLibTopicoption> svyLibTopicoptions = svyLibTopicoptionMapper.selectSvyLibTopicoptionList(svyLibTopicoption);
+                //灏嗘煡璇㈠嚭鐨勯�夐」鐩斁鍒伴鐩腑
+                svyLibTopics.get(j).setSvyLibTopicoptions(svyLibTopicoptions);
+            }
+        }
+        return svyLibTopics;
     }
 
     /**
@@ -71,6 +92,36 @@
         return svyLibTopicMapper.insertSvyLibTopic(svyLibTopic);
     }
 
+    @Override
+    public Integer saveOrUpdateTopic(SvyLibTopic svyLibTopic) {
+        Integer i = null;
+
+        //瀵归鐩繘琛屽鐞�
+        if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 1) {
+            //鏂板
+            i = svyLibTopicMapper.insertSvyLibTopic(svyLibTopic);
+        } else if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 2) {
+            //淇敼
+            i = svyLibTopicMapper.updateSvyLibTopic(svyLibTopic);
+        }
+
+        //瀵归鐩�夐」杩涜澶勭悊
+        if (CollectionUtils.isNotEmpty(svyLibTopic.getSvyLibTopicoptions())) {
+            for (SvyLibTopicoption svyLibTopicoption : svyLibTopic.getSvyLibTopicoptions()) {
+                if (svyLibTopicoption.getIsoperation() != null && svyLibTopicoption.getIsoperation() == 1) {
+                    //鏂板
+                    svyLibTopicoption.setTopicid(svyLibTopic.getTopicid());
+                    svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
+                } else if (svyLibTopicoption.getIsoperation() != null && svyLibTopicoption.getIsoperation() == 2) {
+                    //淇敼
+                    svyLibTopicoption.setTopicid(svyLibTopic.getTopicid());
+                    svyLibTopicoptionMapper.updateSvyLibTopicoption(svyLibTopicoption);
+                }
+            }
+        }
+        return i;
+    }
+
     /**
      * 淇敼闂嵎棰樼洰
      *

--
Gitblit v1.9.3