人物信息和左侧树类别关联使用id

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

@@ -25,6 +25,9 @@ public class CharacterChangeInfo extends Model<CharacterChangeInfo> {
   private String uid;
   //人物名称
   private String name;
+  //类别id 和左侧树进行关联  character_category_structure
+  private String typeId;
+  private String typeName;
   //原单位
   private String companyOriginal;
   //原部门 原单位 原企业

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

@@ -19,18 +19,24 @@ import java.util.List;
 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.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 " +
+            "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 " +
             "from character_basic_info a " +
-            "LEFT JOIN character_change_info b " +
+            "INNER JOIN character_change_info b " +
             "on a.id = b.id " +
+            "LEFT JOIN character_category_structure c " +
+            "ON b.type_id = c.id " +
             "where a.uid = #{uid}")
     CharacterVo getByUid(String uid);
 
     @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_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 " +
+            "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 " +
             "from character_basic_info a " +
-            "LEFT JOIN character_change_info b " +
+            "INNER JOIN character_change_info b " +
             "on a.id = b.id " +
+            "LEFT JOIN character_category_structure c " +
+            "ON b.type_id = c.id " +
             "where a.id = #{id}")
     CharacterVo getById(String id);
 
@@ -41,10 +47,13 @@ public interface CharacterBasicInfoMapper extends BaseMapper<CharacterBasicInfo>
     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_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 " +
+            "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 " +
             "from character_basic_info a " +
-            "LEFT JOIN character_change_info b " +
+            "INNER JOIN character_change_info b " +
             "on a.id = b.id " +
+            "LEFT JOIN character_category_structure c " +
+            "ON b.type_id = c.id " +
             "where 1=1 " +
             "and (b.status != 0 or b.status IS NULL)" +
             "and b.check_result = 1 " +
@@ -55,7 +64,7 @@ public interface CharacterBasicInfoMapper extends BaseMapper<CharacterBasicInfo>
 
     @Select("select count(1) " +
             "from character_basic_info a " +
-            "LEFT JOIN character_change_info b " +
+            "INNER JOIN character_change_info b " +
             "on a.id = b.id " +
             "where 1=1 " +
             "and b.duty = #{duty} " +

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

@@ -42,4 +42,7 @@ public class CharacterListVo {
 
     //分类类型:领导人、专家、高管'
     private String category;
+
+    //类别 根据左侧树id
+    private String typeId;
 }

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

@@ -83,6 +83,9 @@ public class CharacterVo {
     /**
      * 职务变更信息
      */
+    //类别id 和左侧树进行关联  character_category_structure
+    private String typeId;
+    private String typeName;
     //原单位
     private String companyOriginal;
     //原部门 原单位 原企业

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

+package com.zzsn.leaderbase.vo;
+
+import lombok.Data;
+
+/**
+ * 根据关键词从ES中查询重要报道
+ * @Version 1.0
+ * @Author: ZhangJingKun
+ * @Date: 2024/3/4 16:12
+ * @Content:
+ */
+@Data
+public class RelatedReportsVo {
+
+    //当前页码，默认值为1
+    private Integer pageNo = 1;
+
+    //分页偏移量 根据 pageNo 和 pageSize 计算得到
+    private Integer offset;
+
+    //每页数量，默认值为10
+    private Integer pageSize = 10;
+
+    //排序字段，多个排序字段用逗号分隔
+    private String column = "publishDate";
+    //降序DESC 升序 ASC 默认为DESC
+    private String order = "DESC";
+
+    private String keyword;
+
+}