From 7ef571e23124892654b480c7120fa69a4ae9eb36 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 25 七月 2024 09:34:43 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java | 65 ++++++++++++++------------------
1 files changed, 28 insertions(+), 37 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 089e67e..f90d53f 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
@@ -1,7 +1,6 @@
package com.smartor.service.impl;
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.*;
@@ -12,6 +11,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
@@ -30,13 +30,13 @@
@Autowired
private SvyLibTemplateMapper svyLibTemplateMapper;
@Autowired
- private Icd10AssociationMapper icd10AssociationMapper;
- @Autowired
private SvyLibTemplateScriptMapper svyLibTemplateScriptMapper;
@Autowired
private SvyLibTemplateTargetoptionMapper svyLibTemplateTargetoptionMapper;
@Autowired
private TempDetpRelevanceMapper tempDetpRelevanceMapper;
+ @Autowired
+ private SvyLibTemplateTagMapper svyLibTemplateTagMapper;
/**
* 鏌ヨ闂嵎
@@ -60,11 +60,8 @@
List<SvyLibTemplate> svyLibTemplates = svyLibTemplateMapper.selectSvyLibTemplateList(svyLibTemplateReq);
//娣诲姞棰樼洰
for (int i = 0; i < svyLibTemplates.size(); i++) {
-// SvyLibScript svyLibScript = new SvyLibScript();
-// svyLibScript.setSvyid(svyLibTemplates.get(i).getSvyid());
-// List<SvyLibScript> svyLibTopics = svyLibScriptMapper.selectSvyLibScriptList(svyLibScript);
SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
- svyLibTemplateScript.setId(svyLibTemplates.get(i).getSvyid());
+ svyLibTemplateScript.setSvyid(svyLibTemplates.get(i).getSvyid());
List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
//鑾峰彇棰樼洰閫夐」
a:
@@ -89,6 +86,12 @@
tempDetpRelevance.setTempid(svyLibTemplates.get(i).getSvyid());
List<TempDetpRelevance> tempDetpRelevances = tempDetpRelevanceMapper.selectTempDetpRelevanceList(tempDetpRelevance);
svyLibTemplates.get(i).setTempDetpRelevances(CollectionUtils.isNotEmpty(tempDetpRelevances) ? tempDetpRelevances : new ArrayList<>());
+
+ //鑾峰彇鏍囩
+ SvyLibTemplateTag svyLibTemplateTag = new SvyLibTemplateTag();
+ svyLibTemplateTag.setTemplateid(svyLibTemplates.get(i).getSvyid());
+ List<SvyLibTemplateTag> svyLibTemplateTags = svyLibTemplateTagMapper.selectSvyLibTemplateTagList(svyLibTemplateTag);
+ svyLibTemplates.get(i).setSvyLibTemplateTagList(svyLibTemplateTags);
}
//鍏堝皢鐩稿悓鐨刬d鐨刬cdname,鏁寸悊鍒颁竴鍧�
@@ -109,40 +112,13 @@
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.getSvyLibScripts().size(); i++) {
-// SvyLibScript svyLibScript = svyLibTemplate.getSvyLibScripts().get(i);
-// svyLibScript.setSvyid(svyLibTemplate.getSvyid());
-// //棰樼洰鐨勯�夐」鐩紝鐩存帴鐢╯vy_topicoption琛紝鐢╯vyTopicidf鍘诲叧鑱�
-// svyLibScriptMapper.insertSvyLibScript(svyLibScript);
-// }
-// return 1;
-// }
-
/**
* 鏂板鎴栦慨鏀归棶鍗锋ā鏉夸俊鎭�
*
* @param svyLibTemplate
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
@Override
public Integer saveOrUpdateTemplate(SvyLibTemplate svyLibTemplate) {
Integer i = null;
@@ -202,6 +178,21 @@
}
}
+
+ //鏍囩澶勭悊
+ if (CollectionUtils.isNotEmpty(svyLibTemplate.getSvyLibTemplateTagList())) {
+ for (SvyLibTemplateTag svyLibTemplateTag : svyLibTemplate.getSvyLibTemplateTagList()) {
+ if (svyLibTemplateTag.getId() == null) {
+ //鏂板
+ svyLibTemplateTag.setTemplateid(svyLibTemplate.getSvyid());
+ svyLibTemplateTagMapper.insertSvyLibTemplateTag(svyLibTemplateTag);
+ } else {
+ svyLibTemplateTag.setTemplateid(svyLibTemplate.getSvyid());
+ svyLibTemplateTagMapper.updateSvyLibTemplateTag(svyLibTemplateTag);
+ }
+ }
+
+ }
return i;
}
@@ -242,14 +233,14 @@
private void scriptHandle(Long svyid, SvyLibTemplateScript svyLibScript, Integer isoperation) {
if (isoperation == 1) {
//鏂板
- svyLibScript.setId(svyid);
+ svyLibScript.setSvyid(svyid);
svyLibScript.setId(null);
svyLibScript.setCreateTime(new Date());
svyLibTemplateScriptMapper.insertSvyLibTemplateScript(svyLibScript);
} else if (isoperation == 2) {
//淇敼
- svyLibScript.setId(svyid);
+ svyLibScript.setSvyid(svyid);
svyLibScript.setUpdateTime(new Date());
svyLibTemplateScriptMapper.updateSvyLibTemplateScript(svyLibScript);
} else if (isoperation == 3) {
--
Gitblit v1.9.3