From e52b0e34fc06372aab64c30b526ec289b99c9af7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 19 六月 2024 10:43:47 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java | 131 ++++++++++++++++++++++---------------------
1 files changed, 68 insertions(+), 63 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 9f3abf0..c81b222 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
@@ -1,21 +1,21 @@
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 com.smartor.service.ISvyLibTemplateService;
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.service.ISvyLibTemplateService;
-import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* 闂嵎Service涓氬姟灞傚鐞�
@@ -31,9 +31,9 @@
@Autowired
private Icd10AssociationMapper icd10AssociationMapper;
@Autowired
- private SvyLibScriptMapper svyLibScriptMapper;
+ private SvyLibTemplateScriptMapper svyLibTemplateScriptMapper;
@Autowired
- private SvyLibScriptOptionMapper svyLibTopicoptionMapper;
+ private SvyLibTemplateTargetoptionMapper svyLibTemplateTargetoptionMapper;
@Autowired
private TempDetpRelevanceMapper tempDetpRelevanceMapper;
@@ -59,26 +59,29 @@
List<SvyLibTemplate> svyLibTemplates = svyLibTemplateMapper.selectSvyLibTemplateList(svyLibTemplateReq);
//娣诲姞棰樼洰
for (int i = 0; i < svyLibTemplates.size(); i++) {
- SvyLibScript svyLibTopic = new SvyLibScript();
- svyLibTopic.setSvyid(svyLibTemplates.get(i).getSvyid());
- List<SvyLibScript> svyLibTopics = svyLibScriptMapper.selectSvyLibScriptList(svyLibTopic);
+// SvyLibScript svyLibScript = new SvyLibScript();
+// svyLibScript.setSvyid(svyLibTemplates.get(i).getSvyid());
+// List<SvyLibScript> svyLibTopics = svyLibScriptMapper.selectSvyLibScriptList(svyLibScript);
+ SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
+ svyLibTemplateScript.setSvyid(svyLibTemplates.get(i).getSvyid());
+ List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
//鑾峰彇棰樼洰閫夐」
a:
- 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).getSvyscriptId() == null) {
+ for (int j = 0; j < svyLibTemplateScripts.size(); j++) {
+ log.info("闂id涓猴細{}", svyLibTemplateScripts.get(j).getId());
+ if (StringUtils.isNotEmpty(svyLibTemplateScripts.get(j).getScriptType()) && svyLibTemplateScripts.get(j).getScriptType().equals("3") || svyLibTemplateScripts.get(j).getId() == null) {
//浣滅瓟棰橈紝涓嶉渶瑕侀�夐」
continue a;
} else {
- SvyLibScriptOption svyLibTopicoption = new SvyLibScriptOption();
- svyLibTopicoption.setTopicid(svyLibTopics.get(j).getSvyscriptId());
- List<SvyLibScriptOption> svyLibTopicoptions = svyLibTopicoptionMapper.selectSvyLibScriptOptionList(svyLibTopicoption);
+ SvyLibTemplateTargetoption svyLibTopicoption = new SvyLibTemplateTargetoption();
+ svyLibTopicoption.setScriptid(svyLibTemplateScripts.get(j).getId());
+ List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(svyLibTopicoption);
//灏嗘煡璇㈠嚭鐨勯�夐」鐩斁鍒伴鐩腑
- svyLibTopics.get(j).setSvyLibScriptOptions(svyLibTopicoptions);
+ svyLibTemplateScripts.get(j).setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions);
}
}
//灏嗛鐩斁鍒伴棶鍗峰垪琛ㄤ腑
- svyLibTemplates.get(i).setSvyLibTopics(svyLibTopics);
+ svyLibTemplates.get(i).setSvyLibScripts(svyLibTemplateScripts);
//鑾峰彇姣忎釜闂嵎瀵瑰簲鐨勭瀹�
TempDetpRelevance tempDetpRelevance = new TempDetpRelevance();
@@ -105,33 +108,33 @@
return libTemplates;
}
- /**
- * 鏂板闂嵎
- *
- * @param svyLibTemplate 闂嵎
- * @return 缁撴灉
- */
- @Transactional
- @Override
- public int insertSvyLibTemplate(SvyLibTemplate svyLibTemplate) {
- svyLibTemplate.setCreateTime(DateUtils.getNowDate());
- svyLibTemplateMapper.insertSvyLibTemplate(svyLibTemplate);
- //鍏宠仈闂嵎鐤剧梾
- for (String icdId : svyLibTemplate.getIcdID()) {
- Icd10Association icd10Association = new Icd10Association();
- icd10Association.setIcd10code(icdId);
- icd10Association.setSvyid(svyLibTemplate.getSvyid());
- icd10AssociationMapper.insertIcd10Association(icd10Association);
- }
- //鏂板闂棰樼洰
- for (int i = 0; i < svyLibTemplate.getSvyLibTopics().size(); i++) {
- SvyLibScript svyLibScript = svyLibTemplate.getSvyLibTopics().get(i);
- svyLibScript.setSvyid(svyLibTemplate.getSvyid());
- //棰樼洰鐨勯�夐」鐩紝鐩存帴鐢╯vy_topicoption琛紝鐢╯vyTopicidf鍘诲叧鑱�
- svyLibScriptMapper.insertSvyLibScript(svyLibScript);
- }
- return 1;
- }
+// /**
+// * 鏂板闂嵎
+// *
+// * @param svyLibTemplate 闂嵎
+// * @return 缁撴灉
+// */
+// @Transactional
+// @Override
+// public int insertSvyLibTemplate(SvyLibTemplate svyLibTemplate) {
+// svyLibTemplate.setCreateTime(DateUtils.getNowDate());
+// svyLibTemplateMapper.insertSvyLibTemplate(svyLibTemplate);
+// //鍏宠仈闂嵎鐤剧梾
+// for (String icdId : svyLibTemplate.getIcdID()) {
+// Icd10Association icd10Association = new Icd10Association();
+// icd10Association.setIcd10code(icdId);
+// icd10Association.setSvyid(svyLibTemplate.getSvyid());
+// icd10AssociationMapper.insertIcd10Association(icd10Association);
+// }
+// //鏂板闂棰樼洰
+// for (int i = 0; i < svyLibTemplate.getSvyLibScripts().size(); i++) {
+// SvyLibScript svyLibScript = svyLibTemplate.getSvyLibScripts().get(i);
+// svyLibScript.setSvyid(svyLibTemplate.getSvyid());
+// //棰樼洰鐨勯�夐」鐩紝鐩存帴鐢╯vy_topicoption琛紝鐢╯vyTopicidf鍘诲叧鑱�
+// svyLibScriptMapper.insertSvyLibScript(svyLibScript);
+// }
+// return 1;
+// }
/**
* 鏂板鎴栦慨鏀归棶鍗锋ā鏉夸俊鎭�
@@ -153,31 +156,33 @@
}
//澶勭悊棰樼洰
- if (CollectionUtils.isNotEmpty(svyLibTemplate.getSvyLibTopics())) {
- for (SvyLibScript svyLibTopic : svyLibTemplate.getSvyLibTopics()) {
+ if (CollectionUtils.isNotEmpty(svyLibTemplate.getSvyLibScripts())) {
+ for (SvyLibTemplateScript svyLibScript : svyLibTemplate.getSvyLibScripts()) {
+ SvyLibTemplateScript svyLibTemplateScript = DtoConversionUtils.sourceToTarget(svyLibScript, SvyLibTemplateScript.class);
//瀵归鐩繘琛屽鐞�
- if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 1) {
+ if (svyLibScript.getIsoperation() != null && svyLibScript.getIsoperation() == 1) {
//鏂板
- svyLibTopic.setSvyid(svyLibTemplate.getSvyid());
- //棰樼洰鐨勯�夐」鐩紝鐩存帴鐢╯vy_topicoption琛紝鐢╯vyTopicid鍘诲叧鑱�
- svyLibScriptMapper.insertSvyLibScript(svyLibTopic);
- } else if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 2) {
+ svyLibTemplateScript.setSvyid(svyLibTemplate.getSvyid());
+ svyLibTemplateScript.setId(null);
+ svyLibTemplateScriptMapper.insertSvyLibTemplateScript(svyLibTemplateScript);
+
+ } else if (svyLibScript.getIsoperation() != null && svyLibScript.getIsoperation() == 2) {
//淇敼
- svyLibTopic.setSvyid(svyLibTemplate.getSvyid());
- svyLibScriptMapper.updateSvyLibScript(svyLibTopic);
+ svyLibTemplateScript.setSvyid(svyLibTemplate.getSvyid());
+ svyLibTemplateScriptMapper.updateSvyLibTemplateScript(svyLibTemplateScript);
}
//瀵归鐩�夐」杩涜澶勭悊
- if (CollectionUtils.isNotEmpty(svyLibTopic.getSvyLibScriptOptions())) {
- for (SvyLibScriptOption svyLibTopicoption : svyLibTopic.getSvyLibScriptOptions()) {
- if (svyLibTopicoption.getIsoperation() != null && svyLibTopicoption.getIsoperation() == 1) {
+ if (CollectionUtils.isNotEmpty(svyLibScript.getSvyLibTemplateTargetoptions())) {
+ for (SvyLibTemplateTargetoption svyLibTemplateTargetoption : svyLibScript.getSvyLibTemplateTargetoptions()) {
+ if (svyLibTemplateTargetoption.getIsoperation() != null && svyLibTemplateTargetoption.getIsoperation() == 1) {
//鏂板
- svyLibTopicoption.setTopicid(svyLibTopic.getId());
- svyLibTopicoptionMapper.insertSvyLibScriptOption(svyLibTopicoption);
- } else if (svyLibTopicoption.getIsoperation() != null && svyLibTopicoption.getIsoperation() == 2) {
+ svyLibTemplateTargetoption.setScriptid(svyLibScript.getId());
+ svyLibTemplateTargetoptionMapper.insertSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
+ } else if (svyLibTemplateTargetoption.getIsoperation() != null && svyLibTemplateTargetoption.getIsoperation() == 2) {
//淇敼
- svyLibTopicoption.setTopicid(svyLibTopic.getId());
- svyLibTopicoptionMapper.updateSvyLibScriptOption(svyLibTopicoption);
+ svyLibTemplateTargetoption.setScriptid(svyLibScript.getId());
+ svyLibTemplateTargetoptionMapper.updateSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
}
}
--
Gitblit v1.9.3