From 04fa1170edc2f47e9ad87ec5c7181ff7fc2ca501 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 25 十二月 2025 16:40:40 +0800
Subject: [PATCH] 【丽水】 景宁没有给随访时间，不发送通知短信
---
smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java
index ea4cfb4..29dbaf2 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrTaskTemplateServiceImpl.java
@@ -11,10 +11,10 @@
import com.smartor.mapper.IvrTaskTemplateMapper;
import com.smartor.mapper.IvrTaskTemplateScriptMapper;
import com.smartor.mapper.IvrTaskTemplateTargetoptionMapper;
-import com.smartor.mapper.TemplateDeptMapper;
import com.smartor.service.IIvrTaskTemplateService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -41,8 +41,6 @@
@Autowired
private IvrTaskTemplateTargetoptionMapper ivrTaskTemplateTargetoptionMapper;
- @Autowired
- private TemplateDeptMapper templateDeptMapper;
/**
* 鏌ヨ闅忚浠诲姟闅忚妯℃澘搴�
@@ -58,6 +56,7 @@
@Override
public IvrTaskTemplateVO selectIvrTaskTemplateInfoByID(Long ID) {
IvrTaskTemplate ivrTaskTemplate = ivrTaskTemplateMapper.selectIvrTaskTemplateByID(ID);
+ if (ObjectUtils.isEmpty(ivrTaskTemplate)) throw new BaseException("璇ラ殢璁挎ā鏉夸笉瀛樺湪锛岃妫�鏌ュ悗鍐嶆煡璇�");
IvrTaskTemplateVO ivrTaskTemplateVO = DtoConversionUtils.sourceToTarget(ivrTaskTemplate, IvrTaskTemplateVO.class);
IvrTaskTemplateScript ivrTaskTemplateScript = new IvrTaskTemplateScript();
ivrTaskTemplateScript.setTemplateID(ivrTaskTemplate.getId());
@@ -119,6 +118,7 @@
@Override
public int saveOrUpdateTempScript(IvrTaskTemplateVO ivrTaskTemplateVO) {
Integer i = null;
+ String orgId = ivrTaskTemplateVO.getOrgid();
IvrTaskTemplate ivrTaskTemplate = DtoConversionUtils.sourceToTarget(ivrTaskTemplateVO, IvrTaskTemplate.class);
if (ivrTaskTemplateVO.getIsoperation() != null && ivrTaskTemplateVO.getIsoperation() == 1) {
@@ -128,7 +128,16 @@
//鏂板
ivrTaskTemplate.setCreateTime(new Date());
+ ivrTaskTemplate.setDelFlag("0");
+ ivrTaskTemplate.setOrgid(orgId);
+ log.info("鍑嗗鎻掑叆妯℃澘锛宒elFlag={}", ivrTaskTemplate.getDelFlag());
insertIvrTaskTemplate(ivrTaskTemplate);
+ log.info("鎻掑叆鎴愬姛锛屾ā鏉縄D={}", ivrTaskTemplate.getId());
+
+ // 绔嬪嵆鏌ヨ楠岃瘉
+ IvrTaskTemplate checkTemplate = ivrTaskTemplateMapper.selectIvrTaskTemplateByID(ivrTaskTemplate.getId());
+ log.info("绔嬪嵆鏌ヨ缁撴灉: {}", checkTemplate != null ? "鎵惧埌璁板綍, delFlag=" + checkTemplate.getDelFlag() : "鏈壘鍒拌褰�");
+
i = ivrTaskTemplate.getId().intValue();
} else if (ivrTaskTemplateVO.getIsoperation() != null && ivrTaskTemplateVO.getIsoperation() == 2) {
//淇敼
@@ -140,7 +149,7 @@
//瀵规ā鏉胯瘽鏈拰閫夐」杩涜澶勭悊锛堣瘽鏈〃涓庢寚鏍囪〃杩涜鍚堝苟浜嗭紝锛�
if (CollectionUtils.isNotEmpty(ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList())) {
- log.error("ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList()鏄惁鏈夋暟鎹搱锛歿}", ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList());
+// log.error("ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList()鏄惁鏈夋暟鎹搱锛歿}", ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList());
for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList()) {
ivrTaskTemplateScriptVO.setGuid(ivrTaskTemplateVO.getGuid());
ivrTaskTemplateScriptVO.setOrgid(ivrTaskTemplateVO.getOrgid());
@@ -177,16 +186,6 @@
*/
@Override
public int deleteIvrTaskTemplateByIDs(Long[] IDs) {
- if (IDs[0] != null) {
- IvrTaskTemplate ivrTaskTemplate = selectIvrTaskTemplateByID(IDs[0]);
- if (StringUtils.isNotEmpty(ivrTaskTemplate.getLongTemp()) && ivrTaskTemplate.getLongTemp().equals("1")) {
- //濡傛灉杩欎釜妯℃澘鏄暱鏈熶换鍔★紝鍒欓渶瑕佸垹闄ゆā鏉夸笌閮ㄩ棬鐨勫叧鑱�
- TemplateDept templateDept = new TemplateDept();
- templateDept.setType(21L);
- templateDept.setTempid(IDs[0]);
- templateDeptMapper.deleteTemplateDeptByTemplateId(templateDept);
- }
- }
return ivrTaskTemplateMapper.deleteIvrTaskTemplateByIDs(IDs);
}
@@ -207,16 +206,16 @@
*/
@Override
public IvrTaskTemplateVO selectInfoByCondition(IvrTaskTemplateVO ivrTaskTemplateVO) {
- log.info("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢鐨勫叆鍙備负 : {}", ivrTaskTemplateVO);
+ log.info("鏌ヨ璇煶浠诲姟妯℃澘璇︽儏鏍规嵁鏉′欢鐨勫叆鍙備负 : {}", ivrTaskTemplateVO);
//鍏堟牴鎹潯浠舵煡璇㈤棶棰樿〃淇℃伅
IvrTaskTemplate ivrTaskTemplate = DtoConversionUtils.sourceToTarget(ivrTaskTemplateVO, IvrTaskTemplate.class);
List<IvrTaskTemplate> ivrTaskTemplates = selectIvrTaskTemplateList(ivrTaskTemplate);
if (CollectionUtils.isEmpty(ivrTaskTemplates)) {
- log.info("鎻愪緵鐨勬潯浠�,鏌ヨ妯℃澘璇︽儏鏁版嵁涓虹┖锛歿}", ivrTaskTemplates);
- throw new BaseException("鎻愪緵鐨勬潯浠�,鏌ヨ妯℃澘璇︽儏鏁版嵁涓虹┖");
+ log.info("鎻愪緵鐨勬潯浠�,鏌ヨ璇煶浠诲姟妯℃澘璇︽儏鏁版嵁涓虹┖锛歿}", ivrTaskTemplates);
+ throw new BaseException("鎻愪緵鐨勬潯浠�,鏌ヨ璇煶浠诲姟妯℃澘璇︽儏鏁版嵁涓虹┖");
}
- log.info("ivrLibaTemplates鐨勬煡璇㈢粨鏋滀负:{},鏁伴噺涓� : {}", ivrTaskTemplates.get(0), ivrTaskTemplates.size());
+ log.info("ivrTaskTemplates鐨勬煡璇㈢粨鏋滀负:{},鏁伴噺涓� : {}", ivrTaskTemplates.get(0), ivrTaskTemplates.size());
//瀹氫箟IvrLibaTemplateVO 鐢ㄤ簬杩斿弬
IvrTaskTemplateVO templateVO = DtoConversionUtils.sourceToTarget(ivrTaskTemplates.get(0), IvrTaskTemplateVO.class);
//
@@ -233,7 +232,7 @@
//閫氳繃璇濇湳ID鑾峰彇閫夐」
for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : ivrTaskTemplateScriptVOS) {
- log.info("ivrLibaTemplateScriptVO鐨勪富閿甶d涓猴細{}", ivrTaskTemplateScriptVO.getId());
+ log.info("IvrTaskTemplateScriptVO鐨勪富閿甶d涓猴細{}", ivrTaskTemplateScriptVO.getId());
IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption = new IvrTaskTemplateTargetoption();
ivrTaskTemplateTargetoption.setScriptid(ivrTaskTemplateScriptVO.getId());
List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = ivrTaskTemplateTargetoptionMapper.selectIvrTaskTemplateTargetoptionList(ivrTaskTemplateTargetoption);
--
Gitblit v1.9.3