问题修改

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

 package com.zzsn.leaderbase.controller;
 
 import com.zzsn.leaderbase.service.CharacterInfoService;
+import com.zzsn.leaderbase.util.DateUtil;
 import com.zzsn.leaderbase.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +28,17 @@ public class CharacterInfoController {
      */
     @PostMapping("/add")
     public Result<?> add(@RequestBody CharacterVo characterVo){
-        log.info("新增任务:{}",characterVo);
+        log.info("新增人物:{}",characterVo);
+        //日期格式校验
+        String birthday = characterVo.getBirthday();
+        if(!DateUtil.isValidDate(birthday))
+            return Result.error(400, "出生日期格式不正确！");
+        String takeOfficeTime = characterVo.getTakeOfficeTime();
+        if(!DateUtil.isValidDate(takeOfficeTime))
+            return Result.error(400, "任职开始时间格式不正确！");
+        String takeOfficeTimeEnd = characterVo.getTakeOfficeTimeEnd();
+        if(!DateUtil.isValidDate(takeOfficeTime))
+            return Result.error(400, "任职结束时间格式不正确！");
         return characterInfoService.add(characterVo);
     }
 
@@ -61,6 +72,16 @@ public class CharacterInfoController {
     @PostMapping("/edit")
     public Result<?> edit(@RequestBody CharacterVo characterVo){
         log.info("根据人物id修改信息:{}",characterVo);
+        //日期格式校验
+        String birthday = characterVo.getBirthday();
+        if(!DateUtil.isValidDate(birthday))
+            return Result.error(400, "出生日期格式不正确！");
+        String takeOfficeTime = characterVo.getTakeOfficeTime();
+        if(!DateUtil.isValidDate(takeOfficeTime))
+            return Result.error(400, "任职开始时间格式不正确！");
+        String takeOfficeTimeEnd = characterVo.getTakeOfficeTimeEnd();
+        if(!DateUtil.isValidDate(takeOfficeTimeEnd))
+            return Result.error(400, "任职结束时间格式不正确！");
         return characterInfoService.edit(characterVo);
     }
 

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

@@ -30,9 +30,7 @@ public class CharacterBasicInfo extends Model<CharacterBasicInfo> {
   //出生地
   private String birthplace;
   //出生日期
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-  @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private Date birthday;
+  private String birthday;
   //籍贯
   private String nativePlace;
   //毕业院校

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

@@ -30,9 +30,7 @@ public class CharacterBasicInfoHistory extends Model<CharacterBasicInfoHistory>
   //出生地
   private String birthplace;
   //出生日期
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-  @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private Date birthday;
+  private String birthday;
   //籍贯
   private String nativePlace;
   //毕业院校

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

@@ -41,21 +41,15 @@ public class CharacterChangeInfo extends Model<CharacterChangeInfo> {
   //职务(现)
   private String duty;
   //任职时间
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-  @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private Date takeOfficeTime;
+  private String takeOfficeTime;
   //任职结束时间
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-  @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private Date takeOfficeTimeEnd;
+  private String takeOfficeTimeEnd;
   //任职状态
   private String takeOfficeStatus;
   //变更链接
   private String changeUrl;
   //职务变更时间
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-  @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private Date dutiesUpdateTime;
+  private String dutiesUpdateTime;
   //职务变更原因
   private String dutiesUpdateReason;
   //是否审核  1是 0否
@@ -65,7 +59,7 @@ public class CharacterChangeInfo extends Model<CharacterChangeInfo> {
   //关联资讯id
   private String articleId;
   //关联资讯标题
-  private String articleTitle;
+  private String articleIndex;
   //变更描述
   private String updateDesc;
   //创建人

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

-package com.zzsn.leaderbase.entity;
-
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("character_tag")
-public class CharacterTag {
-
-  //主键
-  private String id;
-
-  //标签名称
-  private String name;
-
-  //标签编码
-  private String code;
-
-  //标签类别
-  private String type;
-
-  //分类类型:领导人、专家、企业高管
-  private String category;
-
-  //创建人
-  private String createBy;
-
-  //创建时间
-  @TableField(fill = FieldFill.INSERT)
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-  private Date createTime;
-
-  //更新人
-  private String updateBy;
-
-  //更新时间
-  @TableField(fill = FieldFill.INSERT)
-  @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-  private Date updateTime;
-
-  //启停状态  1启 0停
-  private long status;
-
-  //描述
-  private String description;
-
-  //排序
-  private long sort;
-
-}

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

+package com.zzsn.leaderbase.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("label_entity")
+public class LabelEntity {
+
+  private String id;
+  private String name;
+  private String synonym;
+  private String explanation;
+  private long level;
+  private String topId;
+  private String pathIds;
+  private long status;
+  private long sort;
+  private String createBy;
+  private java.sql.Timestamp createTime;
+  private String updateBy;
+  private java.sql.Timestamp updateTime;
+  private String sysOrgCode;
+  private String pid;
+  private String hasChild;
+
+
+}

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

@@ -20,7 +20,7 @@ public interface CharacterBasicInfoMapper extends BaseMapper<CharacterBasicInfo>
 
     @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.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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 " +
+            "b.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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_index,b.update_desc,b.original_id,b.new_id,b.merge_status,a.create_by,a.create_time,a.update_by,a.update_time " +
             "from character_basic_info a " +
             "INNER JOIN character_change_info b " +
             "on a.id = b.id " +
@@ -31,7 +31,7 @@ public interface CharacterBasicInfoMapper extends BaseMapper<CharacterBasicInfo>
 
     @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.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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 " +
+            "b.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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_index,b.update_desc,b.original_id,b.new_id,b.merge_status,a.create_by,a.create_time,a.update_by,a.update_time " +
             "from character_basic_info a " +
             "INNER JOIN character_change_info b " +
             "on a.id = b.id " +
@@ -48,7 +48,7 @@ public interface CharacterBasicInfoMapper extends BaseMapper<CharacterBasicInfo>
 
     @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.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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 " +
+            "b.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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_index,b.update_desc,b.original_id,b.new_id,b.merge_status,a.create_by,a.create_time,a.update_by,a.update_time " +
             "from character_basic_info a " +
             "INNER JOIN character_change_info b " +
             "on a.id = b.id " +
@@ -75,7 +75,7 @@ public interface CharacterBasicInfoMapper extends BaseMapper<CharacterBasicInfo>
 
     @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.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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, " +
+            "b.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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_index,b.update_desc,b.original_id,b.new_id,b.merge_status,a.create_by,a.create_time,a.update_by,a.update_time, " +
             "COALESCE(b.take_office_time, b.create_time) AS order_time " +
             "from character_basic_info a " +
             "INNER JOIN character_change_info b " +

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

 package com.zzsn.leaderbase.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zzsn.leaderbase.entity.CharacterTag;
-import com.zzsn.leaderbase.entity.CharacterTagTop;
+import com.zzsn.leaderbase.entity.LabelEntity;
 import com.zzsn.leaderbase.entity.SysBaseLabelType;
 import com.zzsn.leaderbase.vo.CharacterVo;
 import com.zzsn.leaderbase.vo.SysBaseLabelTypeVo;
@@ -10,7 +9,6 @@ import com.zzsn.leaderbase.vo.SysLabelVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Version 1.0
@@ -19,7 +17,7 @@ import java.util.Map;
  * @Content:
  */
 @Mapper
-public interface CharacterTagMapper extends BaseMapper<CharacterTag> {
+public interface CharacterTagMapper extends BaseMapper<LabelEntity> {
 
     List<CharacterVo> getCharacterListByTagList(String ids, Integer offset, Integer pageSize);
     Integer getCharacterListByTagCount(String ids);

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

 package com.zzsn.leaderbase.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zzsn.leaderbase.entity.CharacterTag;
 import com.zzsn.leaderbase.entity.CharacterTagTop;
+import com.zzsn.leaderbase.entity.LabelEntity;
 import com.zzsn.leaderbase.vo.Result;
 import com.zzsn.leaderbase.vo.SysBaseLabelTypeVo;
 
@@ -14,7 +14,7 @@ import java.util.List;
  * @Date: 2024/3/21 11:04
  * @Content:
  */
-public interface CharacterTagService extends IService<CharacterTag> {
+public interface CharacterTagService extends IService<LabelEntity> {
 
     Result<?> getTagList(String id, String name);
 

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

@@ -100,7 +100,6 @@ public class DealLeaderDataService {
                                         log.info("数据重复：{}",data.toString());
                                     } else {
                                         list.add(CharacterVo.builder()
-//                                            .uid(UUID.randomUUID().toString().replace("-",""))
                                                 //curStation curWorkPlace person
                                                 .category("领导人")
                                                 .updateDesc(temp.get("updateDesc") != null ? temp.get("updateDesc").toString() : "")
@@ -110,8 +109,8 @@ public class DealLeaderDataService {
                                                 .companyOriginal(temp.get("oriWorkPlace") != null ? temp.get("oriWorkPlace").toString() : "")
                                                 .company(temp.get("curWorkPlace") != null ? temp.get("curWorkPlace").toString() : "")
                                                 .name(temp.get("person") != null ? temp.get("person").toString() : "")
-                                                //.articleId(dataResult.get("id") != null ? idIndexMap.get("id") + "," + dataResult.get("id").toString() : "")
                                                 .articleId(dataResult.get("id") != null ? dataResult.get("id").toString() : "")
+                                                .articleIndex(dataResult.get("id") != null ? idIndexMap.get("id") : "")
                                                 .checkStatus(0L)
                                                 .createTime(new Date())
                                                 .build());

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

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zzsn.leaderbase.entity.CharacterTag;
 import com.zzsn.leaderbase.entity.CharacterTagTop;
+import com.zzsn.leaderbase.entity.LabelEntity;
 import com.zzsn.leaderbase.entity.SysBaseLabelType;
 import com.zzsn.leaderbase.mapper.CharacterTagMapper;
 import com.zzsn.leaderbase.mapper.CharacterTagTopMapper;
@@ -29,7 +29,7 @@ import java.util.*;
  * @Content:
  */
 @Service
-public class CharacterTagServiceImpl extends ServiceImpl<CharacterTagMapper, CharacterTag> implements CharacterTagService {
+public class CharacterTagServiceImpl extends ServiceImpl<CharacterTagMapper, LabelEntity> implements CharacterTagService {
 
     @Autowired
     CharacterTagMapper characterTagMapper;
@@ -66,15 +66,15 @@ public class CharacterTagServiceImpl extends ServiceImpl<CharacterTagMapper, Cha
     public Result<?> getCharacterListByTag(String tagName, Integer pageNo, Integer pageSize) {
         Integer offset = (pageNo -1) * pageSize;
 
-        List<CharacterTag> tagList = null;
+        List<LabelEntity> tagList = null;
         //根据标签名称查询标签信息
-        LambdaQueryWrapper<CharacterTag> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.eq(CharacterTag::getName, tagName);
+        LambdaQueryWrapper<LabelEntity> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(LabelEntity::getName, tagName);
         tagList = characterTagMapper.selectList(lambdaQuery);
         if(tagList.size() == 0){
             //根据名称如果没有匹配到标签信息，则使用模糊查找
-            LambdaQueryWrapper<CharacterTag> lambdaQueryLike = Wrappers.lambdaQuery();
-            lambdaQueryLike.like(CharacterTag::getName, tagName);
+            LambdaQueryWrapper<LabelEntity> lambdaQueryLike = Wrappers.lambdaQuery();
+            lambdaQueryLike.like(LabelEntity::getName, tagName);
             tagList = characterTagMapper.selectList(lambdaQueryLike);
             if(tagList.size() == 0){
                 //模糊查询也没有数据，直接返回
@@ -82,7 +82,7 @@ public class CharacterTagServiceImpl extends ServiceImpl<CharacterTagMapper, Cha
             }
         }
         List<String> tagIds = new ArrayList<>();
-        for (CharacterTag characterTag : tagList) {
+        for (LabelEntity characterTag : tagList) {
             tagIds.add(characterTag.getId());
         }
         //根据标签列表查询人物信息

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

@@ -70,7 +70,7 @@ public class CharacterMergeStatus {
         characterVoNew.setCheckStatus(1L);
         characterVoNew.setCheckResult(character.getCheckResult());
         characterVoNew.setArticleId(character.getArticleId());
-        characterVoNew.setArticleTitle(character.getArticleTitle());
+        characterVoNew.setArticleIndex(character.getArticleIndex());
         characterVoNew.setUpdateDesc(character.getUpdateDesc());
         characterVoNew.setOriginalId(originalCharacter.getId());
         characterVoNew.setNewId(character.getId());

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

@@ -38,9 +38,7 @@ public class CharacterVo {
     //出生地
     private String birthplace;
     //出生日期
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date birthday;
+    private String birthday;
     //籍贯
     private String nativePlace;
     //毕业院校
@@ -105,21 +103,15 @@ public class CharacterVo {
     //职务(现)
     private String duty;
     //任职时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date takeOfficeTime;
+    private String takeOfficeTime;
     //任职结束时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date takeOfficeTimeEnd;
+    private String takeOfficeTimeEnd;
     //任职状态
     private String takeOfficeStatus;
     //变更链接
     private String changeUrl;
     //职务变更时间
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date dutiesUpdateTime;
+    private String dutiesUpdateTime;
     //职务变更原因
     private String dutiesUpdateReason;
     //是否审核  1是 0否
@@ -129,7 +121,7 @@ public class CharacterVo {
     //关联资讯id
     private String articleId;
     //关联资讯标题
-    private String articleTitle;
+    private String articleIndex;
     //变更描述
     private String updateDesc;
 

src/main/resources/mapper/CharacterBasicInfoMapper.xml

@@ -7,7 +7,7 @@
     <select id="getList" resultType="com.zzsn.leaderbase.vo.CharacterVo">
     select * from (
         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,d.tag_id,d.tag_name,
-               b.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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
+               b.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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_index,b.update_desc,b.original_id,b.new_id,b.merge_status,a.create_by,a.create_time,a.update_by,a.update_time
         from character_basic_info a
         INNER JOIN character_change_info b
         on a.id = b.id
@@ -88,7 +88,7 @@
 
     <select id="checkList" resultType="com.zzsn.leaderbase.vo.CharacterVo">
         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.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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
+               b.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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_index,b.update_desc,b.original_id,b.new_id,b.merge_status,a.create_by,a.create_time,a.update_by,a.update_time
         from character_basic_info a
         INNER JOIN character_change_info b
         on a.id = b.id

src/main/resources/mapper/CharacterTagMapper.xml

@@ -6,7 +6,7 @@
 
     <select id="getCharacterListByTagList" resultType="com.zzsn.leaderbase.vo.CharacterVo">
         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,d.tag_id,d.tag_name,
-        b.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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
+        b.type_id,c.type_name,b.company_original,b.department_original,b.duty_original,b.company,b.department,b.duty,b.take_office_time,b.take_office_time_end,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_index,b.update_desc,b.original_id,b.new_id,b.merge_status,a.create_by,a.create_time,a.update_by,a.update_time
         from character_basic_info a
         INNER JOIN character_change_info b
         on a.id = b.id