From a0bcee3aa22b79f592c44cdb3dcdbd681490f265 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 15 一月 2024 10:34:31 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 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 a0e587a..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,10 +1,12 @@
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.*;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +35,8 @@
private SvyLibTopicMapper svyLibTopicMapper;
@Autowired
private SvyLibTopicoptionMapper svyLibTopicoptionMapper;
+ @Autowired
+ private TempDetpRelevanceMapper tempDetpRelevanceMapper;
/**
* 鏌ヨ闂嵎
@@ -63,7 +67,7 @@
a:
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) {
+ if (StringUtils.isNotEmpty(svyLibTopics.get(j).getTopictype()) && svyLibTopics.get(j).getTopictype().equals("3") || svyLibTopics.get(j).getSvyTopicId() == null) {
//浣滅瓟棰橈紝涓嶉渶瑕侀�夐」
continue a;
} else {
@@ -76,6 +80,12 @@
}
//灏嗛鐩斁鍒伴棶鍗峰垪琛ㄤ腑
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,鏁寸悊鍒颁竴鍧�
@@ -152,7 +162,7 @@
svyLibTopic.setSvyid(svyLibTitle.getSvyid());
//棰樼洰鐨勯�夐」鐩紝鐩存帴鐢╯vy_topicoption琛紝鐢╯vyTopicid鍘诲叧鑱�
svyLibTopicMapper.insertSvyLibTopic(svyLibTopic);
- } else if (svyLibTitle.getIsoperation() != null && svyLibTopic.getIsoperation() == 2) {
+ } else if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 2) {
//淇敼
svyLibTopic.setSvyid(svyLibTitle.getSvyid());
svyLibTopicMapper.updateSvyLibTopic(svyLibTopic);
@@ -176,6 +186,20 @@
}
}
+
+ 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;
}
--
Gitblit v1.9.3