From fdf1b9c1e4489a0c2615fa596268b2f71fad7b4c Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期一, 15 四月 2024 09:08:10 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java | 100 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 90 insertions(+), 10 deletions(-) diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java index 03b1226..75cd312 100644 --- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java +++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java @@ -1,19 +1,20 @@ package com.smartor.service.impl; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DtoConversionUtils; +import com.ruoyi.common.utils.StringUtils; import com.smartor.domain.*; -import com.smartor.mapper.Icd10AssociationMapper; -import com.smartor.mapper.SvyLibTopicMapper; -import com.smartor.mapper.SvyTopicoptionMapper; +import com.smartor.mapper.*; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.smartor.mapper.SvyLibTitleMapper; import com.smartor.service.ISvyLibTitleService; import org.springframework.transaction.annotation.Transactional; @@ -23,6 +24,7 @@ * @author ruoyi * @date 2023-03-02 */ +@Slf4j @Service public class SvyLibTitleServiceImpl implements ISvyLibTitleService { @Autowired @@ -32,7 +34,9 @@ @Autowired private SvyLibTopicMapper svyLibTopicMapper; @Autowired - private SvyTopicoptionMapper svyTopicoptionMapper; + private SvyLibTopicoptionMapper svyLibTopicoptionMapper; + @Autowired + private TempDetpRelevanceMapper tempDetpRelevanceMapper; /** * 鏌ヨ闂嵎 @@ -62,19 +66,26 @@ //鑾峰彇棰樼洰閫夐」 a: for (int j = 0; j < svyLibTopics.size(); j++) { - if (svyLibTopics.get(j).getTopictype() == 3) { + log.info("闂id涓猴細{}", svyLibTopics.get(j).getSvyTopicId()); + if (StringUtils.isNotEmpty(svyLibTopics.get(j).getTopictype()) && svyLibTopics.get(j).getTopictype().equals("3") || svyLibTopics.get(j).getSvyTopicId() == null) { //浣滅瓟棰橈紝涓嶉渶瑕侀�夐」 continue a; } else { - SvyTopicoption svyTopicoption = new SvyTopicoption(); - svyTopicoption.setTopicid(svyLibTopics.get(j).getSvyTopicId()); - List<SvyTopicoption> svyTopicoptions = svyTopicoptionMapper.selectSvyTopicoptionList(svyTopicoption); + SvyLibTopicoption svyLibTopicoption = new SvyLibTopicoption(); + svyLibTopicoption.setTopicid(svyLibTopics.get(j).getSvyTopicId()); + List<SvyLibTopicoption> svyLibTopicoptions = svyLibTopicoptionMapper.selectSvyLibTopicoptionList(svyLibTopicoption); //灏嗘煡璇㈠嚭鐨勯�夐」鐩斁鍒伴鐩腑 - svyLibTopics.get(j).setSvyTopicoptions(svyTopicoptions); + svyLibTopics.get(j).setSvyLibTopicoptions(svyLibTopicoptions); } } //灏嗛鐩斁鍒伴棶鍗峰垪琛ㄤ腑 svyLibTitles.get(i).setSvyLibTopics(svyLibTopics); + + //鑾峰彇姣忎釜闂嵎瀵瑰簲鐨勭瀹� + TempDetpRelevance tempDetpRelevance = new TempDetpRelevance(); + tempDetpRelevance.setTempid(svyLibTitles.get(i).getSvyid()); + List<TempDetpRelevance> tempDetpRelevances = tempDetpRelevanceMapper.selectTempDetpRelevanceList(tempDetpRelevance); + svyLibTitles.get(i).setTempDetpRelevances(CollectionUtils.isNotEmpty(tempDetpRelevances) ? tempDetpRelevances : new ArrayList<>()); } //鍏堝皢鐩稿悓鐨刬d鐨刬cdname,鏁寸悊鍒颁竴鍧� @@ -124,6 +135,75 @@ } /** + * 鏂板鎴栦慨鏀归棶鍗锋ā鏉夸俊鎭� + * + * @param svyLibTitle + * @return + */ + @Override + public Integer saveOrUpdateTitle(SvyLibTitle svyLibTitle) { + Integer i = null; + if (svyLibTitle.getIsoperation() != null && svyLibTitle.getIsoperation() == 1) { + //鏂板 + svyLibTitle.setCreateTime(DateUtils.getNowDate()); + i = svyLibTitleMapper.insertSvyLibTitle(svyLibTitle); + } else if (svyLibTitle.getIsoperation() != null && svyLibTitle.getIsoperation() == 2) { + //淇敼 + svyLibTitle.setUpdateTime(DateUtils.getNowDate()); + i = svyLibTitleMapper.updateSvyLibTitle(svyLibTitle); + } + + //澶勭悊棰樼洰 + if (CollectionUtils.isNotEmpty(svyLibTitle.getSvyLibTopics())) { + for (SvyLibTopic svyLibTopic : svyLibTitle.getSvyLibTopics()) { + //瀵归鐩繘琛屽鐞� + if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 1) { + //鏂板 + svyLibTopic.setSvyid(svyLibTitle.getSvyid()); + //棰樼洰鐨勯�夐」鐩紝鐩存帴鐢╯vy_topicoption琛紝鐢╯vyTopicid鍘诲叧鑱� + svyLibTopicMapper.insertSvyLibTopic(svyLibTopic); + } else if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 2) { + //淇敼 + svyLibTopic.setSvyid(svyLibTitle.getSvyid()); + 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); + } + } + + } + + } + } + + if (CollectionUtils.isNotEmpty(svyLibTitle.getTempDetpRelevances())) { + for (TempDetpRelevance tempDetpRelevance : svyLibTitle.getTempDetpRelevances()) { + if (tempDetpRelevance.getId() == null) { + //鏂板 + tempDetpRelevance.setTempid(svyLibTitle.getSvyid()); + tempDetpRelevance.setType(1L); + tempDetpRelevanceMapper.insertTempDetpRelevance(tempDetpRelevance); + } else { + tempDetpRelevanceMapper.updateTempDetpRelevance(tempDetpRelevance); + } + } + + } + return i; + } + + /** * 淇敼闂嵎 * * @param svyLibTitle 闂嵎 -- Gitblit v1.9.3