From da6cce0d9f01b98d20b9ed89b438cd32006a8dd8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 22 十一月 2024 17:17:10 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/SvyTaskTemplateServiceImpl.java | 83 +++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskTemplateServiceImpl.java
index a18eb0d..8a1a5b8 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskTemplateServiceImpl.java
@@ -135,38 +135,15 @@
if (CollectionUtils.isNotEmpty(svyTaskTemplateVO.getSvyTaskTemplateScriptVOS())) {
log.error("ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList()鏄惁鏈夋暟鎹搱锛歿}", svyTaskTemplateVO.getSvyTaskTemplateScriptVOS());
for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : svyTaskTemplateVO.getSvyTaskTemplateScriptVOS()) {
- if (svyTaskTemplateScriptVO.getIsoperation() != null && svyTaskTemplateScriptVO.getIsoperation() == 1 || svyTaskTemplateScriptVO.getIsoperation() == null && svyTaskTemplateScriptVO.getIsoperation() == 1) {
- //鏂板
- SvyTaskTemplateScript svyTaskTemplateScript = DtoConversionUtils.sourceToTarget(svyTaskTemplateScriptVO, SvyTaskTemplateScript.class);
- svyTaskTemplateScript.setTemplateID(svyTaskTemplate.getId());
- svyTaskTemplateScript.setCreateTime(new Date());
- svyTaskTemplateScriptMapper.insertSvyTaskTemplateScript(svyTaskTemplateScript);
- svyTaskTemplateScript.setIsoperation(1);
- //瀵归�夐」鐩繘琛屽鐞�
- dealOption(svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions(), svyTaskTemplateScript, svyTaskTemplate.getId());
-
- } else if (svyTaskTemplateScriptVO.getIsoperation() != null && svyTaskTemplateScriptVO.getIsoperation() == 2) {
- //淇敼
- SvyTaskTemplateScript svyTaskTemplateScript = DtoConversionUtils.sourceToTarget(svyTaskTemplateScriptVO, SvyTaskTemplateScript.class);
- svyTaskTemplateScript.setTemplateID(svyTaskTemplate.getId());
- svyTaskTemplateScript.setUpdateTime(new Date());
- svyTaskTemplateScriptMapper.updateSvyTaskTemplateScript(svyTaskTemplateScript);
- svyTaskTemplateScript.setIsoperation(2);
- //瀵归�夐」鐩繘琛屽鐞�
- dealOption(svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions(), svyTaskTemplateScript, svyTaskTemplate.getId());
-
- } else if (svyTaskTemplateScriptVO.getIsoperation() != null && svyTaskTemplateScriptVO.getIsoperation() == 3) {
- //鍒犻櫎
- if (svyTaskTemplateScriptVO.getID() == null) {
- log.info("鍒犻櫎澶辫触,妯℃澘璇濇湳id涓虹┖");
- } else {
- svyTaskTemplateScriptVO.setUpdateTime(new Date());
- svyTaskTemplateScriptMapper.deleteSvyTaskTemplateScriptByID(svyTaskTemplateScriptVO.getID());
- }
+ if (svyTaskTemplateScriptVO.getIsoperation() != null) {
+ SvyTaskTemplateScript svyTaskTemplateScript = scriptHandle(svyTaskTemplate, svyTaskTemplateScriptVO, svyTaskTemplateScriptVO.getIsoperation());
+ dealOption(svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions(), svyTaskTemplateScript, svyTaskTemplate.getId(), svyTaskTemplateScriptVO.getIsoperation());
+ } else {
+ SvyTaskTemplateScript svyTaskTemplateScript = scriptHandle(svyTaskTemplate, svyTaskTemplateScriptVO, svyTaskTemplateVO.getIsoperation());
+ dealOption(svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions(), svyTaskTemplateScript, svyTaskTemplate.getId(), svyTaskTemplateVO.getIsoperation());
}
}
}
-
return i;
}
@@ -197,9 +174,9 @@
//閫氳繃璇濇湳ID鑾峰彇閫夐」
for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : svyTaskTemplateScriptVOS) {
- log.info("svyLibaTemplateScriptVO鐨勪富閿甶d涓猴細{}", svyTaskTemplateScriptVO.getID());
+ log.info("svyLibaTemplateScriptVO鐨勪富閿甶d涓猴細{}", svyTaskTemplateScriptVO.getId());
SvyTaskTemplateTargetoption svyTaskTemplateTargetoption = new SvyTaskTemplateTargetoption();
- svyTaskTemplateTargetoption.setScriptid(svyTaskTemplateScriptVO.getID());
+ svyTaskTemplateTargetoption.setScriptid(svyTaskTemplateScriptVO.getId());
List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateTargetoptionMapper.selectSvyTaskTemplateTargetoptionList(svyTaskTemplateTargetoption);
for (SvyTaskTemplateTargetoption svyTaskTemplateTargetoption1 : svyTaskTemplateTargetoptions) {
ObjectMapper mapper = new ObjectMapper();
@@ -229,30 +206,62 @@
}
- private void dealOption(List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions, SvyTaskTemplateScript svyTaskTemplateScript, Long tmpID) {
+ private SvyTaskTemplateScript scriptHandle(SvyTaskTemplate svyTaskTemplate, SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, Integer isoperation) {
+ SvyTaskTemplateScript svyTaskTemplateScript = DtoConversionUtils.sourceToTarget(svyTaskTemplateScriptVO, SvyTaskTemplateScript.class);
+ if (isoperation == 1) {
+ //鏂板
+ svyTaskTemplateScript.setTemplateID(svyTaskTemplate.getId());
+ svyTaskTemplateScript.setCreateTime(new Date());
+ svyTaskTemplateScriptMapper.insertSvyTaskTemplateScript(svyTaskTemplateScript);
+ svyTaskTemplateScript.setIsoperation(1);
+ } else if (isoperation == 2) {
+ //淇敼
+ svyTaskTemplateScript.setTemplateID(svyTaskTemplate.getId());
+ svyTaskTemplateScript.setUpdateTime(new Date());
+ svyTaskTemplateScriptMapper.updateSvyTaskTemplateScript(svyTaskTemplateScript);
+ svyTaskTemplateScript.setIsoperation(2);
+ } else if (isoperation == 3) {
+ if (svyTaskTemplateScriptVO.getId() == null) {
+ log.info("鍒犻櫎澶辫触,妯℃澘璇濇湳id涓虹┖");
+ } else {
+ svyTaskTemplateScriptVO.setUpdateTime(new Date());
+ svyTaskTemplateScriptMapper.deleteSvyTaskTemplateScriptByID(svyTaskTemplateScriptVO.getId());
+ }
+ }
+ return svyTaskTemplateScript;
+ }
+
+ private void dealOption(List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions, SvyTaskTemplateScript svyTaskTemplateScript, Long tmpID, Integer isoperation) {
log.info("svyTaskTemplateScript鐨勫�间负锛歿}", svyTaskTemplateScript);
+ Integer lsIsoperation = isoperation;
//瀵规ā鏉挎寚鏍囬�夐」杩涜澶勭悊
if (CollectionUtils.isNotEmpty(svyTaskTemplateTargetoptions)) {
for (SvyTaskTemplateTargetoption svyTaskTemplateTargetoption : svyTaskTemplateTargetoptions) {
- if (svyTaskTemplateTargetoption.getIsoperation() != null && svyTaskTemplateTargetoption.getIsoperation() == 1 || svyTaskTemplateTargetoption.getIsoperation() == null && svyTaskTemplateTargetoption.getIsoperation() == 1) {
+ // 濡傛灉閫夐」鏈韩鐨刼peration涓嶄负绌猴紝灏辩敤鑷繁鐨�;涓嶇劧锛屽氨鐢ㄤ紶杩囨潵鐨�
+ if (svyTaskTemplateTargetoption.getIsoperation() != null) {
+ isoperation = svyTaskTemplateTargetoption.getIsoperation();
+ } else {
+ isoperation = lsIsoperation;
+ }
+ if (isoperation == 1) {
//鏂板
svyTaskTemplateTargetoption.setTemplateID(tmpID);
- svyTaskTemplateTargetoption.setScriptid(svyTaskTemplateScript.getID());
+ svyTaskTemplateTargetoption.setScriptid(svyTaskTemplateScript.getId());
if (CollectionUtils.isNotEmpty(svyTaskTemplateTargetoption.getDynamiccruxs()))
svyTaskTemplateTargetoption.setDynamiccruxsJson(JSON.toJSONString(svyTaskTemplateTargetoption.getDynamiccruxs()));
if (CollectionUtils.isNotEmpty(svyTaskTemplateTargetoption.getNodynamiccruxs()))
svyTaskTemplateTargetoption.setNodynamiccruxsJson(JSON.toJSONString(svyTaskTemplateTargetoption.getNodynamiccruxs()));
svyTaskTemplateTargetoptionMapper.insertSvyTaskTemplateTargetoption(svyTaskTemplateTargetoption);
- } else if (svyTaskTemplateTargetoption.getIsoperation() != null && svyTaskTemplateTargetoption.getIsoperation() == 2) {
+ } else if (isoperation == 2) {
//淇敼
svyTaskTemplateTargetoption.setTemplateID(tmpID);
- svyTaskTemplateTargetoption.setScriptid(svyTaskTemplateScript.getID());
+ svyTaskTemplateTargetoption.setScriptid(svyTaskTemplateScript.getId());
if (CollectionUtils.isNotEmpty(svyTaskTemplateTargetoption.getDynamiccruxs()))
svyTaskTemplateTargetoption.setDynamiccruxsJson(JSON.toJSONString(svyTaskTemplateTargetoption.getDynamiccruxs()));
if (CollectionUtils.isNotEmpty(svyTaskTemplateTargetoption.getNodynamiccruxs()))
svyTaskTemplateTargetoption.setNodynamiccruxsJson(JSON.toJSONString(svyTaskTemplateTargetoption.getNodynamiccruxs()));
svyTaskTemplateTargetoptionMapper.updateSvyTaskTemplateTargetoption(svyTaskTemplateTargetoption);
- } else if (svyTaskTemplateTargetoption.getIsoperation() != null && svyTaskTemplateTargetoption.getIsoperation() == 3) {
+ } else if (isoperation == 3) {
//鍒犻櫎
if (svyTaskTemplateTargetoption.getId() == null) {
log.info("鍒犻櫎澶辫触,妯℃澘鎸囨爣閫夐」id涓虹┖");
--
Gitblit v1.9.3