From af396db5b1e6dcbb53879af52bd682b4a7e82664 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 21 十月 2024 15:46:44 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java |   53 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java
index 5066add..e5d0755 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibScriptServiceImpl.java
@@ -1,11 +1,15 @@
 package com.smartor.service.impl;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.smartor.domain.SvyLibScript;
 import com.smartor.domain.SvyLibScriptOption;
+import com.smartor.domain.SvyLibScriptTag;
 import com.smartor.mapper.SvyLibScriptMapper;
 import com.smartor.mapper.SvyLibScriptOptionMapper;
+import com.smartor.mapper.SvyLibScriptTagMapper;
 import com.smartor.service.ISvyLibScriptService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -13,6 +17,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -30,6 +35,9 @@
 
     @Autowired
     private SvyLibScriptOptionMapper svyLibScriptOptionMapper;
+
+    @Autowired
+    private SvyLibScriptTagMapper svyLibScriptTagMapper;
 
     /**
      * 鏌ヨ闂嵎棰樼洰
@@ -50,25 +58,30 @@
      */
     @Override
     public List<SvyLibScript> selectSvyLibScriptList(SvyLibScript svyLibTopic) {
-        //娣诲姞棰樼洰
-
-        List<SvyLibScript> svyLibTopics = svyLibTopicMapper.selectSvyLibScriptList(svyLibTopic);
+        List<SvyLibScript> svyLibScripts = svyLibTopicMapper.selectSvyLibScriptList(svyLibTopic);
         //鑾峰彇棰樼洰閫夐」
+        for (int j = 0; j < svyLibScripts.size(); j++) {
+            log.info("闂id涓猴細{}", svyLibScripts.get(j).getId());
+            if (StringUtils.isNotEmpty(svyLibScripts.get(j).getIcd10Name()))
+                svyLibScripts.get(j).setIcd10NameList(JSONArray.parseArray(svyLibScripts.get(j).getIcd10Name(), String.class));
 
-        for (int j = 0; j < svyLibTopics.size(); j++) {
-            log.info("闂id涓猴細{}", svyLibTopics.get(j).getSvyscriptId());
-            if (StringUtils.isNotEmpty(svyLibTopics.get(j).getScripttype()) && svyLibTopics.get(j).getScripttype().equals("3") || svyLibTopics.get(j).getId() == null) {
+            if (StringUtils.isNotEmpty(svyLibScripts.get(j).getScriptType()) && svyLibScripts.get(j).getScriptType().equals("3") || svyLibScripts.get(j).getId() == null) {
                 //浣滅瓟棰橈紝涓嶉渶瑕侀�夐」
                 continue;
             } else {
                 SvyLibScriptOption svyLibTopicoption = new SvyLibScriptOption();
-                svyLibTopicoption.setTopicid(svyLibTopics.get(j).getId());
+                svyLibTopicoption.setTopicid(svyLibScripts.get(j).getId());
                 List<SvyLibScriptOption> svyLibTopicoptions = svyLibScriptOptionMapper.selectSvyLibScriptOptionList(svyLibTopicoption);
                 //灏嗘煡璇㈠嚭鐨勯�夐」鐩斁鍒伴鐩腑
-                svyLibTopics.get(j).setSvyLibScriptOptions(svyLibTopicoptions);
+                svyLibScripts.get(j).setSvyLibScriptOptions(svyLibTopicoptions);
             }
+            //鑾峰彇tag
+            SvyLibScriptTag svyLibScriptTag = new SvyLibScriptTag();
+            svyLibScriptTag.setScriptid(svyLibScripts.get(j).getId());
+            List<SvyLibScriptTag> svyLibScriptTags = svyLibScriptTagMapper.selectSvyLibScriptTagList(svyLibScriptTag);
+            svyLibScripts.get(j).setSvyLibScriptTagList(svyLibScriptTags);
         }
-        return svyLibTopics;
+        return svyLibScripts;
     }
 
     /**
@@ -87,6 +100,10 @@
     @Override
     public Integer saveOrUpdateScript(SvyLibScript svyLibTopic) {
         Integer i = null;
+        if (CollectionUtils.isNotEmpty(svyLibTopic.getIcd10NameList()) && svyLibTopic.getIcd10NameList().size() > 0) {
+            //灏嗘暟缁勮浆鎴愬瓧绗︿覆
+            svyLibTopic.setIcd10Name(JSON.toJSONString(svyLibTopic.getIcd10NameList()));
+        }
 
         //瀵归鐩繘琛屽鐞�
         if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 1) {
@@ -112,7 +129,23 @@
                     svyLibScriptOptionMapper.updateSvyLibScriptOption(svyLibTopicoption);
                 } else if (svyLibTopicoption.getIsoperation() != null && svyLibTopicoption.getIsoperation() == 3) {
                     //鍒犻櫎
-                    svyLibScriptOptionMapper.deleteSvyLibScriptOptionByOptionid(svyLibTopicoption.getOptionid());
+                    svyLibScriptOptionMapper.deleteSvyLibScriptOptionByOptionid(svyLibTopicoption.getId());
+                }
+            }
+        }
+        //鏍囩澶勭悊
+        if (CollectionUtils.isNotEmpty(svyLibTopic.getSvyLibScriptTagList())) {
+            for (SvyLibScriptTag svyLibScriptTag : svyLibTopic.getSvyLibScriptTagList()) {
+                if (svyLibScriptTag.getId() == null) {
+                    //鏂板
+                    svyLibScriptTag.setScriptid(svyLibTopic.getId());
+                    svyLibScriptTag.setCreateTime(new Date());
+                    svyLibScriptTagMapper.insertSvyLibScriptTag(svyLibScriptTag);
+                } else if (svyLibScriptTag.getId() != null) {
+                    //淇敼
+                    svyLibScriptTag.setScriptid(svyLibTopic.getId());
+                    svyLibScriptTag.setUpdateTime(new Date());
+                    svyLibScriptTagMapper.updateSvyLibScriptTag(svyLibScriptTag);
                 }
             }
         }

--
Gitblit v1.9.3