代码提交

liusheng

2024-09-18 907641e56c2085aaa81f267946dc3e3e9fca73e7

 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的del会导致左边的查询不全，先不用吧
//        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);
        }