人物信息操作业务

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

@@ -66,8 +66,8 @@ public class CharacterInfoContorller {
      * @return
      */
     @PostMapping("/list")
-    public Result<?> list(@RequestBody CharacterListVo characterListVo){
-        return Result.OK(characterInfoService.list(characterListVo));
+    public Result<?> getList(@RequestBody CharacterListVo characterListVo){
+        return characterInfoService.getList(characterListVo);
     }
 
     //审核

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

@@ -27,10 +27,14 @@ public class CharacterChangeInfo extends Model<CharacterChangeInfo> {
   private String uid;
   //人物名称
   private String name;
+  //原单位
+  private String companyOriginal;
   //原部门 原单位 原企业
   private String departmentOriginal;
   //原职务
   private String dutyOriginal;
+  //单位(现)
+  private String company;
   //部门 单位 企业(现)
   private String department;
   //职务(现)

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

@@ -27,10 +27,14 @@ public class CharacterChangeInfoHistory extends Model<CharacterChangeInfoHistory
   private String uid;
   //人物名称
   private String name;
+  //原单位
+  private String companyOriginal;
   //原部门 原单位 原企业
   private String departmentOriginal;
   //原职务
   private String dutyOriginal;
+  //单位(现)
+  private String company;
   //部门 单位 企业(现)
   private String department;
   //职务(现)

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

@@ -2,10 +2,13 @@ package com.zzsn.leaderbase.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zzsn.leaderbase.entity.CharacterBasicInfo;
+import com.zzsn.leaderbase.vo.CharacterListVo;
 import com.zzsn.leaderbase.vo.CharacterVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * @Version 1.0
  * @Author: ZhangJingKun
@@ -30,4 +33,8 @@ public interface CharacterBasicInfoMapper extends BaseMapper<CharacterBasicInfo>
             "on a.id = b.id " +
             "where a.id = #{id}")
     CharacterVo getById(String id);
+
+    List<CharacterVo> getList(CharacterListVo characterListVo);
+
+    Integer getCount();
 }

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

@@ -2,8 +2,11 @@ package com.zzsn.leaderbase.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zzsn.leaderbase.entity.CharacterBasicInfo;
+import com.zzsn.leaderbase.vo.CharacterListVo;
 import com.zzsn.leaderbase.vo.CharacterVo;
 
+import java.util.List;
+
 /**
  * @Version 1.0
  * @Author: ZhangJingKun
@@ -15,4 +18,8 @@ public interface CharacterBasicInfoService extends IService<CharacterBasicInfo>
     CharacterVo getByUid(String uid);
 
     CharacterVo getById(String id);
+
+    List<CharacterVo> getList(CharacterListVo characterListVo);
+
+    Integer getCount(CharacterListVo characterListVo);
 }

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

@@ -5,6 +5,8 @@ import com.zzsn.leaderbase.vo.CharacterListVo;
 import com.zzsn.leaderbase.vo.CharacterVo;
 import com.zzsn.leaderbase.vo.Result;
 
+import java.util.List;
+
 /**
  * @Version 1.0
  * @Author: ZhangJingKun
@@ -15,12 +17,15 @@ public interface CharacterInfoService {
 
     Result<?> add(CharacterVo characterVo);
 
+    Result<?> addBulk (List<CharacterVo> list);
+
     CharacterVo getByUid(String uid);
 
     CharacterVo getById(String id);
 
     Result<?> edit(CharacterVo characterVo);
 
-    IPage<CharacterVo> list(CharacterListVo characterListVo);
+    Result<?> getList(CharacterListVo characterListVo);
+
 }
 

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

@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zzsn.leaderbase.entity.CharacterBasicInfo;
 import com.zzsn.leaderbase.mapper.CharacterBasicInfoMapper;
 import com.zzsn.leaderbase.service.CharacterBasicInfoService;
+import com.zzsn.leaderbase.vo.CharacterListVo;
 import com.zzsn.leaderbase.vo.CharacterVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Version 1.0
  * @Author: ZhangJingKun
@@ -30,4 +33,15 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
     public CharacterVo getById(String id) {
         return characterBasicInfoMapper.getById(id);
     }
+
+    @Override
+    public List<CharacterVo> getList(CharacterListVo characterListVo) {
+        List<CharacterVo> list = characterBasicInfoMapper.getList(characterListVo);
+        return list;
+    }
+
+    @Override
+    public Integer getCount(CharacterListVo characterListVo) {
+        return characterBasicInfoMapper.getCount();
+    }
 }

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

 package com.zzsn.leaderbase.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zzsn.leaderbase.entity.CharacterBasicInfo;
@@ -14,6 +13,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Version 1.0
  * @Author: ZhangJingKun
@@ -66,6 +68,37 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
     }
 
     @Override
+    public Result<?> addBulk(List<CharacterVo> list) {
+
+        List<CharacterBasicInfo> characterBasicInfoList = new ArrayList<>();
+        List<CharacterChangeInfo> characterChangeInfoList = new ArrayList<>();
+        List<CharacterBasicInfoHistory> characterBasicInfoHistoryList = new ArrayList<>();
+        for (CharacterVo characterVo : list) {
+            String id = Long.toString(generatorIdService.getOrderId());
+            CharacterBasicInfo characterBasicInfo = new CharacterBasicInfo();
+            BeanUtils.copyProperties(characterVo, characterBasicInfo);
+            characterBasicInfo.setId(id);
+            characterBasicInfoList.add(characterBasicInfo);
+
+            CharacterChangeInfo characterChangeInfo = new CharacterChangeInfo();
+            BeanUtils.copyProperties(characterVo, characterChangeInfo);
+            characterChangeInfo.setId(id);
+            characterChangeInfoList.add(characterChangeInfo);
+
+            CharacterBasicInfoHistory characterBasicInfoHistory = new CharacterBasicInfoHistory();
+            BeanUtils.copyProperties(characterBasicInfo, characterBasicInfoHistory);
+            characterBasicInfoHistory.setId(null);
+            characterBasicInfoHistoryList.add(characterBasicInfoHistory);
+        }
+
+        characterBasicInfoService.saveBatch(characterBasicInfoList);
+        characterChangeInfoService.saveBatch(characterChangeInfoList);
+        characterBasicInfoHistoryService.saveBatch(characterBasicInfoHistoryList);
+
+        return Result.OK();
+    }
+
+    @Override
     public CharacterVo getByUid(String uid) {
         return characterBasicInfoService.getByUid(uid);
     }
@@ -97,12 +130,30 @@ public class CharacterInfoServiceImpl implements CharacterInfoService {
     }
 
     @Override
-    public IPage<CharacterVo> list(CharacterListVo characterListVo) {
-        QueryWrapper<CharacterVo> queryWrapper = new QueryWrapper<>();
-        //queryWrapper.eq("name","王强").leftJoin("")
-
-
-
-        return null;
+    public Result<?> getList(CharacterListVo characterListVo) {
+
+        //参数校验
+        Integer pageNo = characterListVo.getPageNo();
+        Integer pageSize= characterListVo.getPageSize();
+        if(pageNo < 1)
+            return Result.error("参数pageNo的值不能小于1！");
+        if(pageSize < 0)
+            return Result.error("参数pageSize的值不能小于0！");
+        Integer office = pageSize * (pageNo - 1);
+        characterListVo.setOffset(office);
+
+        //根据条件查询数据
+        List<CharacterVo> list = characterBasicInfoService.getList(characterListVo);
+
+        IPage page = new Page();
+        page.setRecords(list);
+
+        //查询总数
+        Integer total = characterBasicInfoService.getCount(characterListVo);
+        page.setTotal(total);
+        page.setCurrent(pageNo);
+        page.setSize(pageSize);
+
+        return Result.OK(page);
     }
 }

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

@@ -14,9 +14,29 @@ public class CharacterListVo {
     //当前页码，默认值为1
     private Integer pageNo = 1;
 
+    //分页偏移量 根据 pageNo 和 pageSize 计算得到
+    private Integer offset;
+
     //每页数量，默认值为10
     private Integer pageSize = 10;
 
+    //排序字段，多个排序字段用逗号分隔
+    private String orders = "create_time";
+    //降序DESC 升序 ASC 默认为DESC
+    private String ordersBy = "DESC";
+
     //人物名称
     private String name;
+
+    //单位(现)
+    private String company;
+
+    //职务(现)
+    private String duty;
+
+    //是否审核  1是 0否
+    private Long checkStatus;
+
+    //是否审核通过 0未通过 1通过 2待定
+    private Long checkResult;
 }

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

@@ -83,10 +83,14 @@ public class CharacterVo {
     /**
      * 职务变更信息
      */
+    //原单位
+    private String companyOriginal;
     //原部门 原单位 原企业
     private String departmentOriginal;
     //原职务
     private String dutyOriginal;
+    //单位(现)
+    private String company;
     //部门 单位 企业(现)
     private String department;
     //职务(现)

src/main/resources/application.yml

@@ -31,7 +31,7 @@ es1:
   password: zzsn9988
 
 mybatis-plus:
-  mapper-locations: classpath*:com/zzsn/leaderbase/mapper/xml/*Mapper.xml
+  mapper-locations: mapper/*.xml
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     map-underscore-to-camel-case: true
\ No newline at end of file

src/main/resources/mapper/CharacterBasicInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zzsn.leaderbase.mapper.CharacterBasicInfoMapper">
+
+    <select id="getList" 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.create_by,a.create_time,a.update_by,a.update_time,a.status,department_original,duty_original,department,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
+        from character_basic_info a
+        LEFT JOIN character_change_info b
+        on a.id = b.id
+        where 1 = 1
+        <if test="name != null and name != ''">
+            AND a.name = #{name}
+        </if>
+        <if test="company != null and company != ''">
+            AND b.department like '%${company}%'
+        </if>
+        <if test="duty != null and duty != ''">
+            AND b.duty = #{duty}
+        </if>
+        <if test="checkStatus != null">
+            AND b.check_status = #{checkStatus}
+        </if>
+        <if test="checkResult != null">
+            AND b.check_result = #{checkResult}
+        </if>
+
+        <if test="orders != null and orders != ''">
+            ORDER BY ${orders} ${ordersBy}
+        </if>
+
+        limit  #{offset}, #{pageSize}
+
+    </select>
+
+    <select id="getCount" resultType="int">
+        SELECT count(1)
+        from character_basic_info a
+        LEFT JOIN character_change_info b
+        on a.id = b.id
+        where 1 = 1
+        <if test="name != null and name != ''">
+            AND a.name = #{name}
+        </if>
+        <if test="company != null and company != ''">
+            AND b.department like '%${company}%'
+        </if>
+        <if test="duty != null and duty != ''">
+            AND b.duty = #{duty}
+        </if>
+        <if test="checkStatus != null">
+            AND b.check_status = #{checkStatus}
+        </if>
+        <if test="checkResult != null">
+            AND b.check_result = #{checkResult}
+        </if>
+
+    </select>
+
+
+</mapper>
\ No newline at end of file