From 5389773b2d1ae86daec68b00f67c3682dc907e01 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 22 十一月 2024 14:35:48 +0800
Subject: [PATCH] 代码提交(长期任务电话完成)
---
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 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 7baac3f..1d9bdc9 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
@@ -14,9 +14,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -35,7 +33,7 @@
@Autowired
private SvyLibTemplateTargetoptionMapper svyLibTemplateTargetoptionMapper;
@Autowired
- private TempDetpRelevanceMapper tempDetpRelevanceMapper;
+ private TemplateDeptMapper templateDeptMapper;
@Autowired
private SvyLibTemplateTagMapper svyLibTemplateTagMapper;
@Autowired
@@ -58,7 +56,23 @@
svyLibTemplateReq.setSvyid(svyLibTemplate.getSvyid());
svyLibTemplateReq.setCategoryid(svyLibTemplate.getCategoryid());
svyLibTemplateReq.setDescription(svyLibTemplate.getDescription());
- return svyLibTemplateMapper.selectSvyLibTemplateList(svyLibTemplateReq);
+ List<SvyLibTemplate> svyLibTemplates = svyLibTemplateMapper.selectSvyLibTemplateList(svyLibTemplateReq);
+ for (SvyLibTemplate svyLibTemplate1 : svyLibTemplates) {
+ SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
+ svyLibTemplateScript.setSvyid(svyLibTemplate1.getSvyid());
+ List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
+ for (SvyLibTemplateScript svyLibTemplateScript1 : svyLibTemplateScripts) {
+ if (svyLibTemplateScript1.getScriptType().equals("1") || svyLibTemplateScript1.getScriptType().equals("2")) {
+ SvyLibTemplateTargetoption svyLibTemplateTargetoption = new SvyLibTemplateTargetoption();
+ svyLibTemplateTargetoption.setScriptid(svyLibTemplateScript1.getId());
+ List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(svyLibTemplateTargetoption);
+ svyLibTemplateScript1.setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions);
+ }
+ }
+ svyLibTemplate1.setSvyTemplateLibScripts(svyLibTemplateScripts);
+ }
+
+ return svyLibTemplates;
}
/**
@@ -95,9 +109,9 @@
svyLibTemplateVOS.get(i).setSvyTemplateLibScripts(svyLibTemplateScripts);
//鑾峰彇姣忎釜闂嵎瀵瑰簲鐨勭瀹�
- TempDetpRelevance tempDetpRelevance = new TempDetpRelevance();
- tempDetpRelevance.setTempid(svyLibTemplateVOS.get(i).getSvyid());
- List<TempDetpRelevance> tempDetpRelevances = tempDetpRelevanceMapper.selectTempDetpRelevanceList(tempDetpRelevance);
+ TemplateDept templateDept = new TemplateDept();
+ templateDept.setTempid(svyLibTemplateVOS.get(i).getSvyid());
+ List<TemplateDept> tempDetpRelevances = templateDeptMapper.selectTemplateDeptList(templateDept);
svyLibTemplateVOS.get(i).setTempDetpRelevances(CollectionUtils.isNotEmpty(tempDetpRelevances) ? tempDetpRelevances : new ArrayList<>());
//鑾峰彇鏍囩
@@ -127,6 +141,13 @@
//鍐嶅皢鏁寸悊濂界殑鈥滅柧鐥呭悕绉扳�濇浛鎹�
libTemplates.get(i).setIcdname(icdname);
}
+ //灏嗛棶棰樻寜搴忓彿鎺掍竴涓嬪簭
+ Collections.sort(svyLibTemplateVOS.get(j).getSvyTemplateLibScripts(), new Comparator<SvyLibTemplateScript>() {
+ @Override
+ public int compare(SvyLibTemplateScript o1, SvyLibTemplateScript o2) {
+ return Integer.compare(o1.getSort().intValue(), o2.getSort().intValue());
+ }
+ });
}
}
@@ -188,14 +209,14 @@
}
if (CollectionUtils.isNotEmpty(svyLibTemplate.getTempDetpRelevances())) {
- for (TempDetpRelevance tempDetpRelevance : svyLibTemplate.getTempDetpRelevances()) {
+ for (TemplateDept tempDetpRelevance : svyLibTemplate.getTempDetpRelevances()) {
if (tempDetpRelevance.getId() == null) {
//鏂板
tempDetpRelevance.setTempid(svyLibTemplate.getSvyid());
tempDetpRelevance.setType(1L);
- tempDetpRelevanceMapper.insertTempDetpRelevance(tempDetpRelevance);
+ templateDeptMapper.insertTemplateDept(tempDetpRelevance);
} else {
- tempDetpRelevanceMapper.updateTempDetpRelevance(tempDetpRelevance);
+ templateDeptMapper.updateTemplateDept(tempDetpRelevance);
}
}
--
Gitblit v1.9.3