From 37b79cfd8e5ecdc6f9f09750583f998183c338fb Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 07 十一月 2024 10:55:27 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
index ac7b3a5..ce0f95e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
@@ -21,9 +21,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -94,10 +92,25 @@
ivrLibaTarget1.setTargetoptionList(ivrLibaTargetoptions);
}
//鑾峰彇璇ユ寚鏍囩殑鏍囩
- IvrLibaTargetTag ivrLibaTargetTag =new IvrLibaTargetTag();
+ IvrLibaTargetTag ivrLibaTargetTag = new IvrLibaTargetTag();
ivrLibaTargetTag.setTargetid(ivrLibaTarget1.getId());
List<IvrLibaTargetTag> ivrLibaTargetTags = ivrLibaTargetTagMapper.selectIvrLibaTargetTagList(ivrLibaTargetTag);
+
ivrLibaTarget1.setIvrLibaTargetTagList(ivrLibaTargetTags);
+ }
+ //鍒ゆ柇鍏ュ弬鏉′欢涓紝tagName鏄惁鏈夊�硷紝濡傛灉鏈夊�硷紝鍒欓渶瑕佹牴鎹粰鐨勫�艰繘琛屾爣绛捐繃婊�
+ if (StringUtils.isNotEmpty(ivrLibaTarget.getTagName())) {
+ List<IvrLibaTargetVO> ivrLibaTargetVOList = new ArrayList<>();
+ aa:
+ for (IvrLibaTargetVO ivrLibaTarget1 : ivrLibaTargetVOS) {
+ for (IvrLibaTargetTag ivrLibaTargetTag1 : ivrLibaTarget1.getIvrLibaTargetTagList()) {
+ if (ivrLibaTargetTag1.getTagname().contains(ivrLibaTarget.getTagName().trim())) {
+ ivrLibaTargetVOList.add(ivrLibaTarget1);
+ continue aa;
+ }
+ }
+ }
+ ivrLibaTargetVOS = ivrLibaTargetVOList;
}
//涓嬮潰鐢ㄥ乏澶栨劅瑙夋湁鐐归棶棰橈紝where涓殑option鐨刣el浼氬鑷村乏杈圭殑鏌ヨ涓嶅叏锛屽厛涓嶇敤鍚�
// ivrLibaTargetMapper.targetInfo(ivrLibaTarget)
@@ -151,9 +164,12 @@
ivrLibaTarget.setUpdateTime(DateUtils.getNowDate());
if (ivrLibaTargetVO.getIsoperation() != null && ivrLibaTargetVO.getIsoperation() == 1) {
//鏂板
+ ivrLibaTarget.setCreateTime(new Date());
+ ivrLibaTarget.setUpdateTime(new Date());
ivrLibaTargetMapper.insertIvrLibaTarget(ivrLibaTarget);
} else if (ivrLibaTargetVO.getIsoperation() != null && ivrLibaTargetVO.getIsoperation() == 2) {
//淇敼
+ ivrLibaTarget.setUpdateTime(new Date());
ivrLibaTargetMapper.updateIvrLibaTarget(ivrLibaTarget);
}
--
Gitblit v1.9.3