From 0123a0bd06f83a2a973023bb2f197e21118ef293 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 23 七月 2024 18:31:32 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java | 42 +++++-------------------------------------
1 files changed, 5 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 55016ea..5948885 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;
@@ -29,8 +29,6 @@
public class SvyLibTemplateServiceImpl implements ISvyLibTemplateService {
@Autowired
private SvyLibTemplateMapper svyLibTemplateMapper;
- @Autowired
- private Icd10AssociationMapper icd10AssociationMapper;
@Autowired
private SvyLibTemplateScriptMapper svyLibTemplateScriptMapper;
@Autowired
@@ -60,9 +58,6 @@
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.setSvyid(svyLibTemplates.get(i).getSvyid());
List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
@@ -82,7 +77,7 @@
}
}
//灏嗛鐩斁鍒伴棶鍗峰垪琛ㄤ腑
- svyLibTemplates.get(i).setSvyLibScripts(svyLibTemplateScripts);
+ svyLibTemplates.get(i).setSvyTemplateLibScripts(svyLibTemplateScripts);
//鑾峰彇姣忎釜闂嵎瀵瑰簲鐨勭瀹�
TempDetpRelevance tempDetpRelevance = new TempDetpRelevance();
@@ -109,40 +104,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;
@@ -161,8 +129,8 @@
i = svyLibTemplate.getSvyid().intValue();
//澶勭悊棰樼洰
- if (CollectionUtils.isNotEmpty(svyLibTemplate.getSvyLibScripts())) {
- for (SvyLibTemplateScript svyLibScript : svyLibTemplate.getSvyLibScripts()) {
+ if (CollectionUtils.isNotEmpty(svyLibTemplate.getSvyTemplateLibScripts())) {
+ for (SvyLibTemplateScript svyLibScript : svyLibTemplate.getSvyTemplateLibScripts()) {
//瀵归鐩繘琛屽鐞�
if (svyLibScript.getIsoperation() != null) {
//闂鐨勬搷浣滀笉涓虹┖
--
Gitblit v1.9.3