审核 人物合并，新增，追加 张京坤

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

 package com.zzsn.leaderbase.controller;
 
 import com.zzsn.leaderbase.service.CharacterInfoService;
-import com.zzsn.leaderbase.vo.CharacterCheckVo;
-import com.zzsn.leaderbase.vo.CharacterListVo;
-import com.zzsn.leaderbase.vo.CharacterVo;
-import com.zzsn.leaderbase.vo.Result;
+import com.zzsn.leaderbase.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -97,10 +94,11 @@ public class CharacterInfoController {
      * @return
      */
     @GetMapping("/checkList")
-    public Result<?> checkList(@RequestParam(name="articleId",required=true) String articleId){
+    public Result<?> checkList(@RequestParam(name="articleId",required=true) String articleId,
+                               @RequestParam(name="checkResultArr",required=false) String[] checkResultArr){
         if(articleId == null && articleId.length() == 0)
             return Result.error("资讯id不能为空！");
-        return characterInfoService.checkList(articleId);
+        return characterInfoService.checkList(articleId,checkResultArr);
     }
 
     /**
@@ -147,4 +145,27 @@ public class CharacterInfoController {
         return characterInfoService.checkCancelUpdate(id);
     }
 
+
+    /**
+     * 人物合并
+     * 操作类型，1合并人物  2新增人物  3追加历任职务
+     * @param characterMergeVo
+     * @return
+     */
+    @PostMapping("/merge")
+    public Result<?> merge(@RequestBody CharacterMergeVo characterMergeVo){
+        return characterInfoService.merge(characterMergeVo);
+    }
+
+    /**
+     * 取消人物合并
+     * 操作类型，1合并人物  2新增人物  3追加历任职务
+     * @param id
+     * @return
+     */
+    @GetMapping("/mergeCancel")
+    public Result<?> mergeCancel(@RequestParam(name="id",required=true) String id){
+        return characterInfoService.mergeCancel(id);
+    }
+
 }

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Version 1.0
  * @Author: ZhangJingKun
  * @Date: 2024/3/9 15:54
- * @Content:
+ * @Content: 地市信息查询
  */
 @RestController
 @RequestMapping("/api/cityAddress")
@@ -26,4 +26,19 @@ public class CityAddressController {
         return cityAddressService.getCityList();
     }
 
+    /**
+     * 根据父pid查询所有子节点
+     * 要查询根节点下的子节点pid传 "0"
+     * 默认值为0
+     * @param pid
+     * @return
+     */
+    @GetMapping("/getCityListByPid")
+    public Result<?> getCityListByPid(@RequestParam(name="pid",required=true) String pid){
+        //
+        if(pid == null || pid.length() == 0){
+            pid = "0";
+        }
+        return cityAddressService.getCityListByPid(pid);
+    }
 }

src/main/java/com/zzsn/leaderbase/entity/SysBaseDomesticRegion.java

+package com.zzsn.leaderbase.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("sys_base_domestic_region")
+public class SysBaseDomesticRegion {
+
+  private String id;
+  private String name;
+  private String code;
+  private String pathIds;
+  private Long level;
+  private String pid;
+  private String hasChild;
+
+}

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

@@ -38,7 +38,7 @@ public interface CharacterBasicInfoMapper extends BaseMapper<CharacterBasicInfo>
 
     Integer getCount();
 
-    List<CharacterVo> checkList(String articleId);
+    List<CharacterVo> checkList(String articleId,String checkResult);
 
     @Select("select " +
             "a.id,a.uid,a.name,a.sex,a.birthplace,a.birthday,a.native_place,a.school,a.speciality,a.education,a.expert_occupation,a.head_sculpture,a.biographical_notes,a.category,a.award_records,a.part_time_job,a.research_field,a.evaluate,a.status,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_status,b.change_url,b.duties_update_time,b.duties_update_reason,b.check_status,b.check_result,b.article_id,b.article_title,b.update_desc,b.original_id,b.new_id,b.merge_status,a.create_by,a.create_time,a.update_by,a.update_time " +
@@ -47,6 +47,7 @@ public interface CharacterBasicInfoMapper extends BaseMapper<CharacterBasicInfo>
             "on a.id = b.id " +
             "where 1=1 " +
             "and (b.status != 0 or b.status IS NULL)" +
+            "and b.check_result = 1 " +
             "and a.name = #{name} " +
             "and a.id != #{id} " +
             "and b.article_id != #{articleId}")

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

@@ -2,6 +2,7 @@ package com.zzsn.leaderbase.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zzsn.leaderbase.entity.CityAddress;
+import com.zzsn.leaderbase.entity.SysBaseDomesticRegion;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
@@ -14,7 +15,7 @@ import java.util.List;
  * @Content:
  */
 @Mapper
-public interface CityAddressMapper extends BaseMapper<CityAddress> {
+public interface CityAddressMapper extends BaseMapper<SysBaseDomesticRegion> {
 
     @Select("select * from city_address where pid = #{pid}")
     List<CityAddress> getCityList(String pid);

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

@@ -23,7 +23,7 @@ public interface CharacterBasicInfoService extends IService<CharacterBasicInfo>
 
     Integer getCount(CharacterListVo characterListVo);
 
-    List<CharacterVo> checkList(String articleId);
+    List<CharacterVo> checkList(String articleId,String checkResult);
 
     List<CharacterVo> getListByName(String id, String name, String articleId);
 }

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

 package com.zzsn.leaderbase.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zzsn.leaderbase.vo.CharacterCheckVo;
-import com.zzsn.leaderbase.vo.CharacterListVo;
-import com.zzsn.leaderbase.vo.CharacterVo;
-import com.zzsn.leaderbase.vo.Result;
+import com.zzsn.leaderbase.vo.*;
 
 import java.util.List;
 
@@ -30,7 +27,7 @@ public interface CharacterInfoService {
 
     Result<?> getList(CharacterListVo characterListVo);
 
-    Result<?> checkList(String articleId);
+    Result<?> checkList(String articleId, String[] checkResultArr);
 
     Result<?> getListByName(String id, String Name, String articleId);
 
@@ -39,5 +36,8 @@ public interface CharacterInfoService {
     Result<?> checkCancelUpdate(String id);
 
 
+    Result<?> merge(CharacterMergeVo characterMergeVo);
+
+    Result<?> mergeCancel(String id);
 }
 

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

 package com.zzsn.leaderbase.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zzsn.leaderbase.entity.CityAddress;
+import com.zzsn.leaderbase.entity.SysBaseDomesticRegion;
 import com.zzsn.leaderbase.vo.Result;
 
 /**
@@ -11,8 +11,9 @@ import com.zzsn.leaderbase.vo.Result;
  * @Content:
  */
 
-public interface CityAddressService extends IService<CityAddress> {
+public interface CityAddressService extends IService<SysBaseDomesticRegion> {
 
     Result<?> getCityList();
 
+    Result<?> getCityListByPid(String pid);
 }

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

@@ -46,8 +46,8 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
     }
 
     @Override
-    public List<CharacterVo> checkList(String articleId) {
-        return characterBasicInfoMapper.checkList(articleId);
+    public List<CharacterVo> checkList(String articleId, String checkResult) {
+        return characterBasicInfoMapper.checkList(articleId,checkResult);
     }
 
     @Override

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

@@ -7,16 +7,14 @@ import com.zzsn.leaderbase.entity.CharacterBasicInfoHistory;
 import com.zzsn.leaderbase.entity.CharacterChangeInfo;
 import com.zzsn.leaderbase.service.*;
 import com.zzsn.leaderbase.util.CharacterMergeStatus;
-import com.zzsn.leaderbase.vo.CharacterCheckVo;
-import com.zzsn.leaderbase.vo.CharacterListVo;
-import com.zzsn.leaderbase.vo.CharacterVo;
-import com.zzsn.leaderbase.vo.Result;
+import com.zzsn.leaderbase.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -86,8 +84,8 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
             String id = Long.toString(generatorIdService.getOrderId());
             characterVo.setId(id);
             characterVo.setCreateTime(new Date());
-            String uid = generatorIdService.getIdNo();
-            characterVo.setUid(uid);
+//            String uid = generatorIdService.getIdNo();
+//            characterVo.setUid(uid);
 
             CharacterBasicInfo characterBasicInfo = new CharacterBasicInfo();
             BeanUtils.copyProperties(characterVo, characterBasicInfo);
@@ -117,7 +115,10 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
 
     @Override
     public Result<?> getById(String id) {
-        return Result.OK(characterBasicInfoService.getById(id));
+        CharacterVo characterVo = characterBasicInfoService.getById(id);
+        if(characterVo == null)
+            return Result.OK("未查询到人物信息",null);
+        return Result.OK(characterVo);
     }
 
     @Override
@@ -174,18 +175,28 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
 
 
     @Override
-    public Result<?> checkList(String articleId) {
+    public Result<?> checkList(String articleId, String[] checkResultArr) {
 
+        String checkResult = "";
+        if(checkResultArr != null && checkResultArr.length != 0)
+            checkResult = Arrays.toString(checkResultArr).replace("[", "(").replace("]", ")");
         List<CharacterVo> list = new ArrayList<>();
         //当关联多个资讯id时时使用逗号分隔的
         String[] articleIdsArr = articleId.split(",");
         for (String article : articleIdsArr) {
-            List<CharacterVo> characterVoList = characterBasicInfoService.checkList(article);
+            List<CharacterVo> characterVoList = characterBasicInfoService.checkList(article,checkResult);
             list.addAll(characterVoList);
         }
         return Result.OK(list);
     }
 
+    /**
+     * 审核根据姓名查询同名人物，排除当前人物，当前资讯人物
+     * @param id
+     * @param name
+     * @param articleId
+     * @return
+     */
     @Override
     public Result<?> getListByName(String id, String name, String articleId) {
 
@@ -195,6 +206,11 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
 
     }
 
+    /**
+     * 审核
+     * @param characterCheckVo
+     * @return
+     */
     @Override
     public Result<?> checkUpdate(CharacterCheckVo characterCheckVo) {
 
@@ -221,16 +237,14 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
         characterChangeInfoService.save(characterChangeInfo);
 
         //合并前的数据状态修改为停用
-        List<CharacterChangeInfo> updateList = new ArrayList<>();
         CharacterChangeInfo cci1 = new CharacterChangeInfo();
         cci1.setId(originalCharacter.getId());
         cci1.setStatus(0L);
-        updateList.add(cci1);
+        characterChangeInfoService.updateById(cci1);
         CharacterChangeInfo cci2 = new CharacterChangeInfo();
         cci2.setId(character.getId());
         cci2.setStatus(0L);
-        updateList.add(cci2);
-        characterChangeInfoService.updateBatchById(updateList);
+        characterChangeInfoService.updateById(cci2);
 
         //记录人物基本信息修改记录
         CharacterBasicInfoHistory characterBasicInfoHistory = new CharacterBasicInfoHistory();
@@ -241,6 +255,11 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
         return Result.OK(characterVoNew);
     }
 
+    /**
+     * 取消审核
+     * @param id
+     * @return
+     */
     @Override
     public Result<?> checkCancelUpdate(String id) {
         //根据id查询人物信息
@@ -254,11 +273,11 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
         //审核信息 新人物id
         String newId = characterVo.getNewId();
         //审核信息 1:更新人物  2:添加职位
-        Long mergeStatus = characterVo.getMergeStatus();
-        if (mergeStatus == null || originalId == null || newId == null){
-            log.info("数据有误：{}---{}---{}", originalId, newId, mergeStatus);
-            return Result.error("数据有误！");
-        }
+//        Long mergeStatus = characterVo.getMergeStatus();
+//        if (originalId == null || newId == null){
+//            log.info("数据有误：{}---{}---{}", originalId, newId, mergeStatus);
+//            return Result.error("数据有误！");
+//        }
         //恢复合并前的人物为启用
         //合并前的数据状态修改为停用
         List<CharacterChangeInfo> updateList = new ArrayList<>();
@@ -284,4 +303,180 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
         return Result.OK(characterById);
     }
 
+    @Override
+    public Result<?> merge(CharacterMergeVo characterMergeVo) {
+        Result result = Result.OK();
+        Long type = characterMergeVo.getType();
+        String originalId = characterMergeVo.getOriginalId();
+        String newId = characterMergeVo.getNewId();
+        CharacterVo characterVo = characterMergeVo.getCharacter();
+        if(type == 1L){
+            if(originalId == null || originalId.length() == 0 || newId == null || newId.length() == 0){
+                result = Result.error("合并人物时原人物id和新人物id不能为空！");
+            }
+            result = mergeType1(originalId, newId, characterVo);
+        } else if(type == 2L){
+            result = mergeType2(characterVo);
+        } else if(type == 3L){
+            if(originalId == null || originalId.length() == 0){
+                result =  Result.error("追加历任职务原人物id不能为空！");
+            }
+            result = mergeType3(originalId, characterVo);
+        } else {
+            result = Result.error("参数type有误！");
+        }
+        return result;
+    }
+
+    @Override
+    public Result<?> mergeCancel(String id) {
+        //根据id查询数据
+        CharacterVo characterVo = characterBasicInfoService.getById(id);
+        if(characterVo == null){
+            return Result.error("根据id未查询到人物信息");
+        }
+        Long type = characterVo.getMergeStatus();
+        if(type == 1L){
+            //删除当前数据
+            characterBasicInfoService.removeById(id);
+            characterChangeInfoService.removeById(id);
+
+            //恢复合并前的数据为可用状态
+            String originalId = characterVo.getOriginalId();
+            String newId = characterVo.getNewId();
+            CharacterChangeInfo cci1 = new CharacterChangeInfo();
+            cci1.setId(originalId);
+            cci1.setStatus(1L);
+            characterChangeInfoService.updateById(cci1);
+            CharacterChangeInfo cci2 = new CharacterChangeInfo();
+            cci2.setId(newId);
+            cci2.setStatus(1L);
+            characterChangeInfoService.updateById(cci2);
+
+        } else if(type == 2L){
+            //删除当前数据
+            characterBasicInfoService.removeById(id);
+            characterChangeInfoService.removeById(id);
+            //恢复合并前的数据为可用状态
+            String originalId = characterVo.getOriginalId();
+            CharacterChangeInfo cci1 = new CharacterChangeInfo();
+            cci1.setId(originalId);
+            cci1.setStatus(1L);
+            characterChangeInfoService.updateById(cci1);
+
+        } else if(type == 3L){
+
+            //解绑人物uid
+            characterVo.setUid("");
+            //状态为可用
+            characterVo.setStatus(1L);
+            //type状态取消
+            characterVo.setMergeStatus(-1L);
+            //审核状态置为未审核
+            characterVo.setCheckResult(-1L);
+            this.edit(characterVo);
+        } else {
+            return Result.error("参数type有误！");
+        }
+
+        return Result.OK();
+    }
+
+
+    /**
+     * 1合并人物
+     */
+    private Result<?> mergeType1(String originalId, String newId, CharacterVo characterVo){
+        String id = Long.toString(generatorIdService.getOrderId());
+        characterVo.setId(id);
+        //合并人物，若uid为空则从数据库查询
+        String uid = characterVo.getUid();
+        if(uid == null || uid.length() == 0){
+            CharacterVo originalCharacter = characterBasicInfoService.getById(originalId);
+            characterVo.setUid(originalCharacter.getUid());
+        }
+        characterVo.setOriginalId(originalId);
+        characterVo.setNewId(newId);
+        characterVo.setMergeStatus(1L);
+        saveCharacterBasicInfo(characterVo);
+
+        //修改原人物信息为停用
+        CharacterChangeInfo cci1 = new CharacterChangeInfo();
+        cci1.setId(originalId);
+        cci1.setStatus(0L);
+        characterChangeInfoService.updateById(cci1);
+
+        CharacterChangeInfo cci2 = new CharacterChangeInfo();
+        cci2.setId(newId);
+        cci2.setStatus(0L);
+        characterChangeInfoService.updateById(cci2);
+
+        return Result.OK();
+    }
+
+    //2新增人物
+    private Result<?> mergeType2(CharacterVo characterVo){
+        String originalId = characterVo.getId();
+        if(originalId == null || originalId.length() == 0){
+            return Result.error("主键id不能为空！");
+        }
+
+        String id = Long.toString(generatorIdService.getOrderId());
+        characterVo.setId(id);
+        //新增人物，若uid为空则生成uid
+        String uid = characterVo.getUid();
+        if(uid == null || uid.length() == 0){
+            characterVo.setUid(generatorIdService.getIdNo());
+        }
+        characterVo.setMergeStatus(2L);
+        characterVo.setOriginalId(originalId);
+        saveCharacterBasicInfo(characterVo);
+
+        //修改原人物信息为停用
+        CharacterChangeInfo cci1 = new CharacterChangeInfo();
+        cci1.setId(originalId);
+        cci1.setStatus(0L);
+        characterChangeInfoService.updateById(cci1);
+
+        return Result.OK();
+    }
+
+    //3追加历任职务
+    private Result<?> mergeType3(String originalId, CharacterVo characterVo){
+        //uid
+        String uid = characterVo.getUid();
+        if(uid == null || uid.length() == 0){
+            CharacterVo originalCharacter = characterBasicInfoService.getById(originalId);
+            characterVo.setUid(originalCharacter.getUid());
+        }
+        characterVo.setMergeStatus(3L);
+        characterVo.setStatus(0L);
+        this.edit(characterVo);
+
+        return Result.OK();
+    }
+
+
+    /**
+     * 根据vo保存人物基本信息和任职信息
+     * 并记录基本信息修改
+     * @param characterVo
+     */
+    private void saveCharacterBasicInfo(CharacterVo characterVo){
+        //vo对象获取转entity对象，基本信息
+        CharacterBasicInfo characterBasicInfo = new CharacterBasicInfo();
+        BeanUtils.copyProperties(characterVo, characterBasicInfo);
+        characterBasicInfoService.save(characterBasicInfo);
+
+        //vo对象获取转entity对象，任职变更信息
+        CharacterChangeInfo characterChangeInfo = new CharacterChangeInfo();
+        BeanUtils.copyProperties(characterVo, characterChangeInfo);
+        characterChangeInfoService.save(characterChangeInfo);
+
+        //记录任务基本信息修改记录
+        CharacterBasicInfoHistory characterBasicInfoHistory = new CharacterBasicInfoHistory();
+        BeanUtils.copyProperties(characterBasicInfo, characterBasicInfoHistory);
+        characterBasicInfoHistory.setId(null);
+        characterBasicInfoHistoryService.save(characterBasicInfoHistory);
+    }
 }

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

 package com.zzsn.leaderbase.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zzsn.leaderbase.entity.CityAddress;
+import com.zzsn.leaderbase.entity.SysBaseDomesticRegion;
 import com.zzsn.leaderbase.mapper.CityAddressMapper;
 import com.zzsn.leaderbase.service.CityAddressService;
 import com.zzsn.leaderbase.vo.Result;
@@ -17,15 +20,23 @@ import java.util.List;
  * @Content:
  */
 @Service
-public class CityAddressServiceImpl extends ServiceImpl<CityAddressMapper, CityAddress> implements CityAddressService {
+public class CityAddressServiceImpl extends ServiceImpl<CityAddressMapper, SysBaseDomesticRegion> implements CityAddressService {
 
-//    @Autowired
-//    CityAddressMapper cityAddressServiceMapper;
+    @Autowired
+    CityAddressMapper cityAddressServiceMapper;
 
     @Override
     public Result<?> getCityList() {
         //List<CityAddress> list =  cityAddressServiceMapper.getCityList(pid);
-        List<CityAddress> list =  super.list();
+        List<SysBaseDomesticRegion> list =  super.list();
+        return Result.OK(list);
+    }
+
+    @Override
+    public Result<?> getCityListByPid(String pid) {
+        LambdaQueryWrapper<SysBaseDomesticRegion> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(SysBaseDomesticRegion::getPid, pid);
+        List<SysBaseDomesticRegion> list = cityAddressServiceMapper.selectList(lambdaQuery);
         return Result.OK(list);
     }
 }

src/main/java/com/zzsn/leaderbase/util/CharacterMergeStatus.java

@@ -80,65 +80,6 @@ public class CharacterMergeStatus {
     }
 
     /**
-     * 将新的人物职位信息添加到原人物信息中
-     * @param originalCharacter
-     * @param character
-     * @return
-     */
-    public CharacterVo mergeAdd(CharacterVo originalCharacter, CharacterVo character){
-
-        CharacterVo characterVoNew = new CharacterVo();
-        String id = Long.toString(generatorIdService.getOrderId());
-        characterVoNew.setId(id);
-        //人物id使用原人物uid
-        String uid = originalCharacter.getUid();
-        characterVoNew.setUid(uid);
-
-        characterVoNew.setName(getValue(character.getName(), originalCharacter.getName()));
-        characterVoNew.setSex(getValue(character.getSex(), originalCharacter.getSex()));
-        characterVoNew.setBirthplace(getValue(character.getBirthplace(), originalCharacter.getBirthplace()));
-        characterVoNew.setBirthday(getValue(character.getBirthday(), originalCharacter.getBirthday()));
-        characterVoNew.setNativePlace(getValue(character.getNativePlace(), originalCharacter.getNativePlace()));
-        characterVoNew.setSchool(getValue(character.getSchool(), originalCharacter.getSchool()));
-        characterVoNew.setSpeciality(getValue(character.getSpeciality(), originalCharacter.getSpeciality()));
-        characterVoNew.setEducation(getValue(character.getEducation(), originalCharacter.getEducation()));
-        characterVoNew.setExpertOccupation(getValue(character.getExpertOccupation(), originalCharacter.getExpertOccupation()));
-        characterVoNew.setHeadSculpture(getValue(character.getHeadSculpture(), originalCharacter.getHeadSculpture()));
-        characterVoNew.setBiographicalNotes(getValue(character.getBiographicalNotes(), originalCharacter.getBiographicalNotes()));
-        characterVoNew.setCategory(getValue(character.getCategory(), originalCharacter.getCategory()));
-        characterVoNew.setAwardRecords(getValue(character.getAwardRecords(), originalCharacter.getAwardRecords()));
-        characterVoNew.setPartTimeJob(getValue(character.getPartTimeJob(), originalCharacter.getPartTimeJob()));
-        characterVoNew.setResearchField(getValue(character.getResearchField(), originalCharacter.getResearchField()));
-        characterVoNew.setEvaluate(getValue(character.getEvaluate(), originalCharacter.getEvaluate()));
-
-        characterVoNew.setCreateTime(new Date());
-        //原单位、原部门、原职务，新人物中没值去原数据的现
-        characterVoNew.setCompanyOriginal(getValue(character.getCompanyOriginal(), originalCharacter.getCompany()));
-        characterVoNew.setDepartmentOriginal(getValue(character.getDepartmentOriginal(), originalCharacter.getDepartment()));
-        characterVoNew.setDutyOriginal(getValue(character.getDutyOriginal(), originalCharacter.getDuty()));
-        //单位、部门、职务 取新人物中的
-        characterVoNew.setCompany(mergeValue(characterVoNew.getCompany(), character.getCompany()));
-        characterVoNew.setDepartment(mergeValue(characterVoNew.getDepartment(), character.getDepartment()));
-        characterVoNew.setDuty(mergeValue(characterVoNew.getDuty(), character.getDuty()));
-
-        characterVoNew.setTakeOfficeTime(getValue(character.getTakeOfficeTime(), originalCharacter.getTakeOfficeTime()));
-        characterVoNew.setTakeOfficeStatus(getValue(character.getTakeOfficeStatus(), originalCharacter.getTakeOfficeStatus()));
-        characterVoNew.setChangeUrl(mergeValue(characterVoNew.getChangeUrl(), character.getChangeUrl()));
-        characterVoNew.setDutiesUpdateTime(getValue(character.getDutiesUpdateTime(), originalCharacter.getDutiesUpdateTime()));
-        characterVoNew.setDutiesUpdateReason(getValue(character.getDutiesUpdateReason(), originalCharacter.getDutiesUpdateReason()));
-        characterVoNew.setCheckStatus(1L);
-        characterVoNew.setCheckResult(originalCharacter.getCheckResult());
-        characterVoNew.setArticleId(mergeValue(characterVoNew.getArticleId(), character.getArticleId()));
-        characterVoNew.setArticleTitle(mergeValue(characterVoNew.getArticleTitle(), character.getArticleTitle()));
-        characterVoNew.setUpdateDesc(getValue(character.getUpdateDesc(), originalCharacter.getUpdateDesc()));
-        characterVoNew.setOriginalId(originalCharacter.getId());
-        characterVoNew.setNewId(character.getId());
-        characterVoNew.setMergeStatus(2L);
-
-        return characterVoNew;
-    }
-
-    /**
      * 若value1不为空则返回value1，否则返回value2
      * @param value1
      * @param value2

src/main/java/com/zzsn/leaderbase/vo/CharacterMergeVo.java

+package com.zzsn.leaderbase.vo;
+
+import lombok.Data;
+
+/**
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/12 19:56
+ * @Content:
+ */
+@Data
+public class CharacterMergeVo {
+
+    /**
+     * 操作类型，1合并人物  2新增人物  3加到历任职务中
+     */
+    private Long type;
+
+    //原人物id
+    private String originalId;
+
+    //新人物id
+    private String newId;
+
+    //人物信息
+    private CharacterVo character;
+}

src/main/java/com/zzsn/leaderbase/vo/CharacterVo.java

@@ -111,7 +111,7 @@ public class CharacterVo {
     private String dutiesUpdateReason;
     //是否审核  1是 0否
     private Long checkStatus;
-    //是否审核通过 0未通过 1通过 2待定
+    //是否审核通过 0未通过 1通过 2待定 -1未审核
     private Long checkResult;
     //关联资讯id
     private String articleId;
@@ -124,7 +124,7 @@ public class CharacterVo {
     private String originalId;
     //审核信息 新人物id
     private String newId;
-    //审核信息 1:更新人物  2:添加职位
+    //合并结果 1合并人物  2新增人物  3追加历任职务
     private Long mergeStatus;
 
 }

src/main/resources/application.yml

@@ -20,9 +20,9 @@ spring:
       password: elastic
   redis:
     database: 0
-    host: 114.115.236.206
+    host: 114.116.90.53
     password: clbzzsn
-    port: 6379
+    port: 6380
 python:
   getInfoUrl: http://114.115.130.239:1818/update_extraction/
 #  getInfoUrl: http://192.168.1.116:1818/update_extraction/

src/main/resources/mapper/CharacterBasicInfoMapper.xml

@@ -73,7 +73,10 @@
         on a.id = b.id
         where 1 = 1
         and (b.status != 0 or b.status IS NULL)
-        AND b.article_id like '%${article_id}%'
+        AND b.article_id like '%${articleId}%'
+        <if test="checkResult != null and checkResult != ''">
+            AND b.check_result in ${checkResult}
+        </if>
         order by b.id
 
     </select>

src/test/java/com/zzsn/leaderbase/LeaderBaseApplicationTests.java

@@ -6,18 +6,28 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.ArrayList;
 import java.util.List;
-//
-//@SpringBootTest
-//class LeaderBaseApplicationTests {
-//
-//    @Test
-//    void contextLoads() {
-//    }
-//
-//
-//    @Test
-//    void translate(){
-//
-//    }
-//
-//}
+
+@SpringBootTest
+class LeaderBaseApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+
+    @Test
+    void translate(){
+
+    }
+
+    public static void main(String[] args) {
+        StringBuffer sb = new StringBuffer();
+
+        String s = sb.toString();
+        System.out.println(s);
+
+
+
+    }
+
+}