新增履历追加标签修改

2808 新增履历影响原有的履历信息

src/main/java/com/zzsn/leaderbase/mapper/CharacterTagMapMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,6 +28,11 @@ public interface CharacterTagMapMapper extends BaseMapper<CharacterTagMap> {
             "group by a.character_uid")
     Map<String, String> getByUid(String uid);
 
+    @Select("select * from character_tag_map where  character_uid = #{uid}")
+    List<CharacterTagMap> getListByUid(String uid);
+
     @Delete("delete from character_tag_map where character_uid = #{uid}")
     void delByUid(String uid);
+
+
 }

src/main/java/com/zzsn/leaderbase/service/CharacterTagMapService.java

@@ -3,6 +3,7 @@ package com.zzsn.leaderbase.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zzsn.leaderbase.entity.CharacterTagMap;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -14,5 +15,7 @@ import java.util.Map;
 public interface CharacterTagMapService extends IService<CharacterTagMap> {
     Map<String, String> getByUid(String uid);
 
+    List<CharacterTagMap> getListByUid(String uid);
+
     void delByUid(String uid);
 }

src/main/java/com/zzsn/leaderbase/service/impl/CharacterInfoServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Version 1.0
@@ -575,6 +576,29 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
         if(uid == null || uid.length() == 0){
             characterVo.setUid(generatorIdService.getIdNo());
         }
+
+        //标签 新增履历 标签需要追加，先查询库中原有的，然后在合并新增的
+        //根据uid查询标签
+        //todo 2808 新增履历影响原有的履历信息 修改代码
+        /*
+        List<CharacterTagMap> list = characterTagMapService.getListByUid(uid);
+        Set<String> set = new HashSet<>();
+        if(list.size() > 0){
+            for (CharacterTagMap characterTagMap : list) {
+                String tagId = characterTagMap.getTagId();
+                set.add(tagId);
+            }
+        }
+        //将新添加的标签添加到新列表中并利用set集合的不可重复性去重
+        String newTagIds = characterVo.getTagId();
+        String[] newTagIdsArr = newTagIds.split(",");
+        for (String s : newTagIdsArr) {
+            set.add(s);
+        }
+        String tagId = set.stream().collect(Collectors.joining(","));
+        characterVo.setTagId(tagId);
+         */
+
         characterVo.setMergeStatus(2L);
         characterVo.setOriginalId(originalId);
         saveCharacterBasicInfo(characterVo);

src/main/java/com/zzsn/leaderbase/service/impl/CharacterTagMapServiceImpl.java

@@ -7,6 +7,7 @@ import com.zzsn.leaderbase.service.CharacterTagMapService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,6 +28,11 @@ public class CharacterTagMapServiceImpl extends ServiceImpl<CharacterTagMapMappe
     }
 
     @Override
+    public List<CharacterTagMap> getListByUid(String uid) {
+        return characterTagMapMapper.getListByUid(uid);
+    }
+
+    @Override
     public void delByUid(String uid) {
         characterTagMapMapper.delByUid(uid);
     }