人物关联增加关联库里的人物功能

src/main/java/com/zzsn/leaderbase/controller/CharacterBasicInfoController.java

@@ -6,6 +6,7 @@ import com.zzsn.leaderbase.service.CharacterBasicInfoService;
 import com.zzsn.leaderbase.service.IGeneratorIdService;
 import com.zzsn.leaderbase.util.SortUtil;
 import com.zzsn.leaderbase.vo.BasicInfoListVo;
+import com.zzsn.leaderbase.vo.CheckVo;
 import com.zzsn.leaderbase.vo.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -147,6 +148,17 @@ public class CharacterBasicInfoController {
     }
 
     /**
+     * 关联人物合并
+     * @param checkVo
+     * @return
+     */
+    @PostMapping("/correlationMerge")
+    public Result<?> correlationMerge(@RequestBody CheckVo checkVo) {
+        log.info("关联人物合并:{}", checkVo.getSuspectedId());
+        return characterBasicInfoService.correlationMerge(checkVo);
+    }
+
+    /**
      * 企业查询
      *
      * @param socialCreditCode 社会信用代码

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

@@ -53,7 +53,6 @@ public interface CharacterBasicInfoMapper extends BaseMapper<CharacterBasicInfo>
     @Select("select * " +
            "from character_basic_info a " +
             "where 1=1 " +
-            "and main_entry = 1 " +
             "and a.name = #{name} ")
     List<CharacterBasicInfo> getListByName(String name);
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zzsn.leaderbase.entity.CharacterBasicInfo;
 import com.zzsn.leaderbase.vo.BasicInfoListVo;
 import com.zzsn.leaderbase.vo.CharacterVo;
+import com.zzsn.leaderbase.vo.CheckVo;
 import com.zzsn.leaderbase.vo.Result;
 import org.springframework.http.ResponseEntity;
 
@@ -50,6 +51,8 @@ public interface CharacterBasicInfoService extends IService<CharacterBasicInfo>
 
     Result<?> correlationEdit(CharacterBasicInfo characterBasicInfo);
 
+    Result<?> correlationMerge(CheckVo checkVo);
+
     String getDepartmentCreditCode(String socialCreditCode);
 
     List<CharacterBasicInfo> getBasicInfoByCreditCode(String socialCreditCode);

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

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,6 +24,7 @@ import com.zzsn.leaderbase.service.LeaderCategoryService;
 import com.zzsn.leaderbase.util.ExcelUtil;
 import com.zzsn.leaderbase.vo.BasicInfoListVo;
 import com.zzsn.leaderbase.vo.CharacterVo;
+import com.zzsn.leaderbase.vo.CheckVo;
 import com.zzsn.leaderbase.vo.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -244,6 +246,20 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
         return Result.OK(res);
     }
 
+    @Override
+    public Result<?> correlationMerge(CheckVo checkVo){
+        String suspectedId = checkVo.getSuspectedId();
+        List<String> subSuspectedIds= checkVo.getSubSuspectedIds();
+        CharacterBasicInfo characterBasicInfo=this.getById(suspectedId);
+        LambdaUpdateWrapper<CharacterBasicInfo> updateWrapper=new LambdaUpdateWrapper<>();
+        updateWrapper.set(CharacterBasicInfo::getUid, characterBasicInfo.getUid());
+        updateWrapper.set(CharacterBasicInfo::getUpdateTime,new Date());
+        updateWrapper.in(CharacterBasicInfo::getId,subSuspectedIds);
+        this.update(updateWrapper);
+        return Result.OK();
+    }
+
+
     /**
      * 根据社会信用代码查询公司名称
      * @param socialCreditCode