花名册建表以及基础信息功能增删改查功能

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/jobPosion/controller/JobPositionController.java

@@ -554,4 +554,10 @@ public class JobPositionController {
         return pageB;
     }
 
+    @GetMapping("getJobPositionByOff")
+    public ResponseEntity getJobPositionByOff(String id){
+        List<JobPosition> jobPositionList = jobPositionService.list(new QueryWrapper<JobPosition>().eq("office_id", id));
+        return ResponseEntity.ok(jobPositionList);
+    }
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/rank/controller/RankController.java

@@ -13,6 +13,7 @@ import com.jeeplus.sys.domain.Office;
 import com.jeeplus.sys.service.OfficeService;
 import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.sys.service.mapstruct.OfficeWrapper;
+import com.jeeplus.test.jobPosion.domain.JobPosition;
 import com.jeeplus.test.rank.domain.Rank;
 import com.jeeplus.test.rank.domain.RankRRs;
 import com.jeeplus.test.rank.domain.RankRsOffice;
@@ -148,4 +149,10 @@ public class RankController {
         });
         return ResponseEntity.ok (rankSequenceDTOS);
     }
+
+    @GetMapping("getRankByPosition")
+    public ResponseEntity getRankByPosition(String id){
+        List<RankDTO> rankList = rankService.getRankByPosition(id);
+        return ResponseEntity.ok(rankList);
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/rank/mapper/RankMapper.java

@@ -22,4 +22,6 @@ public interface RankMapper extends BaseMapper<Rank> {
     public RankDTO getById(@Param("id") String id);
 
     public void updateUseFlagById(@Param("ids") List<String> ids, @Param("useFlag") String useFlag);
+
+    public List<RankDTO> getRankByPosition(@Param("id") String id);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/rank/mapper/xml/RankMapper.xml

@@ -107,4 +107,14 @@
     </foreach>
   </update>
 
+  <select id="getRankByPosition" resultType="com.jeeplus.test.rank.service.dto.RankDTO">
+    select
+    distinct
+    rc.id,rc.name
+    from rank_children rc
+    inner join rank_rst_position rrp on rc.id = rrp.rc_id and rrp.del_flag = '0'
+    where rc.del_flag = '0' and rrp.position_id = #{id}
+  </select>
+
+
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/rank/service/RankService.java

@@ -158,4 +158,8 @@ public class RankService extends ServiceImpl<RankMapper, Rank> {
     public void updateUseFlagById(List<String> ids, String useFlag){
         rankMapper.updateUseFlagById(ids,useFlag);
     }
+
+    public List<RankDTO> getRankByPosition(String id){
+        return rankMapper.getRankByPosition(id);
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/rank/service/dto/RankDTO.java

@@ -51,5 +51,10 @@ public class RankDTO extends BaseDTO {
      */
     private List<RankChildrenDTO> rankList;
 
+    /**
+     * 子职级名称
+     */
+    private String name;
+
     private static final long serialVersionUID = 1L;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/controller/RosterBaseController.java

@@ -0,0 +1,102 @@
+package com.jeeplus.test.roster.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+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.google.common.collect.Lists;
+import com.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.sys.constant.enums.LogTypeEnum;
+import com.jeeplus.test.rank.domain.Rank;
+import com.jeeplus.test.rank.domain.RankRRs;
+import com.jeeplus.test.rank.domain.RankSequence;
+import com.jeeplus.test.rank.service.RankRRSService;
+import com.jeeplus.test.rank.service.RankSequenceService;
+import com.jeeplus.test.rank.service.RankService;
+import com.jeeplus.test.rank.service.dto.RankDTO;
+import com.jeeplus.test.rank.service.dto.RankSequenceDTO;
+import com.jeeplus.test.rank.service.mapstruct.RankSequenceWrapper;
+import com.jeeplus.test.rank.service.mapstruct.RankWrapper;
+import com.jeeplus.test.roster.domain.RosterBase;
+import com.jeeplus.test.roster.service.RosterBaseService;
+import com.jeeplus.test.roster.service.dto.RosterBaseDTO;
+import com.jeeplus.test.roster.service.mapstruct.RosterBaseWrapper;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Api("花名册")
+@RestController
+@RequestMapping(value = "/roster/base")
+public class RosterBaseController {
+
+    @Autowired
+    private RosterBaseService rosterBaseService;
+
+    /**
+     * 查询花名册列表
+     * @param rosterBaseDTO
+     * @param page
+     * @return
+     * @throws Exception
+     */
+    @ApiLog("查询花名册列表")
+    @PreAuthorize("hasAuthority('roster:base:list')")
+    @GetMapping("list")
+    public ResponseEntity<IPage<RosterBaseDTO>> data(RosterBaseDTO rosterBaseDTO, Page<RosterBaseDTO> page) throws Exception {
+        RosterBase rosterBase = RosterBaseWrapper.INSTANCE.toEntity(rosterBaseDTO);
+        QueryWrapper<RosterBase> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( rosterBase, RosterBase.class );
+        IPage<RosterBaseDTO> result = rosterBaseService.findList (page,queryWrapper);
+        return ResponseEntity.ok (result);
+    }
+
+    /**
+     * 查询花名册数据
+     * @param id
+     * @return
+     */
+    @ApiLog("查询花名册详情")
+    @PreAuthorize ("hasAnyAuthority('roster:base:view','roster:base:add','roster:base:edit')")
+    @GetMapping("queryById")
+    public ResponseEntity queryById(@RequestParam("id") String id) {
+        RosterBaseDTO rosterBaseDTO = rosterBaseService.queryById ( id );
+        return ResponseEntity.ok (rosterBaseDTO);
+    }
+
+    /**
+     * 添加花名册
+     * @param rosterBaseDTO
+     * @return
+     */
+    @ApiLog(value = "修改/新增花名册", type = LogTypeEnum.SAVE)
+    @PreAuthorize("hasAnyAuthority('roster:base:save','roster:base:edit')")
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody RosterBaseDTO rosterBaseDTO, HttpServletRequest request) {
+        return rosterBaseService.saveRoster(rosterBaseDTO);
+    }
+
+    /**
+     * 删除花名册
+     * @param ids
+     * @return
+     */
+    @ApiLog(value = "删除花名册", type = LogTypeEnum.SAVE)
+    @PreAuthorize ("hasAuthority('roster:base:del')")
+    @DeleteMapping("delete")
+    public ResponseEntity delete(String ids,HttpServletRequest request) {
+        String idArray[] =ids.split(",");
+        rosterBaseService.removeByIds (Lists.newArrayList (idArray));
+        return ResponseEntity.ok ("删除花名册成功");
+    }
+
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/domain/RosterBase.java

@@ -0,0 +1,219 @@
+package com.jeeplus.test.roster.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * roster_base
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("roster_base")
+public class RosterBase extends BaseEntity {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 部门id
+     */
+    private String officeId;
+
+    /**
+     * 职位id
+     */
+    private String jobPositionId;
+
+    /**
+     * 职务id
+     */
+    private String positionId;
+
+    /**
+     * 职级id
+     */
+    private String rankId;
+
+    /**
+     * 工号
+     */
+    private String jobNo;
+
+    /**
+     * 证件类型
+     */
+    private String certificatesType;
+
+    /**
+     * 证件号
+     */
+    private String idCard;
+
+    /**
+     * 证件照正面
+     */
+    private String certificatesFront;
+
+    /**
+     * 证件照反面
+     */
+    private String certificatesBack;
+
+    /**
+     * 手机号码
+     */
+    private String mobile;
+
+    /**
+     * 合同类型
+     */
+    private String contractType;
+
+    /**
+     * 员工类型
+     */
+    private String workerType;
+
+    /**
+     * 入职日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    private Date onboardingDate;
+
+    /**
+     * 历史工龄
+     */
+    private String seniority;
+
+    /**
+     * 合同公司
+     */
+    private String contractCompany;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    private Date birthDate;
+
+    /**
+     * 工作地点
+     */
+    private String workPlace;
+
+    /**
+     * 联系地址
+     */
+    private String contactAddress;
+
+    /**
+     * 入职年度就业情形
+     */
+    private String employmentSituation;
+
+    /**
+     * 工时制度
+     */
+    private String workingHour;
+
+    /**
+     * 民族
+     */
+    private String ethnic;
+
+    /**
+     * 户口类型
+     */
+    private String accountType;
+
+    /**
+     * 户口所在地
+     */
+    private String accountAddr;
+
+    /**
+     * 籍贯
+     */
+    private String origin;
+
+    /**
+     * 居住地址
+     */
+    private String liveAddr;
+
+    /**
+     * 最高学历
+     */
+    private String highestEducation;
+
+    /**
+     * 政治面貌
+     */
+    private String politicalFace;
+
+    /**
+     * 婚姻状况
+     */
+    private String maritalStatus;
+
+    /**
+     * 血型
+     */
+    private String bloodType;
+
+    /**
+     * 紧急联系人姓名
+     */
+    private String emergencyContactName;
+
+    /**
+     * 紧急联系人电话
+     */
+    private String emergencyContactTel;
+
+    /**
+     * 配偶姓名
+     */
+    private String spouseName;
+
+    /**
+     * 孩子姓名
+     */
+    private String childName;
+
+    /**
+     * QQ
+     */
+    private String qq;
+
+    /**
+     * 微信
+     */
+    private String wechat;
+
+    /**
+     * 个人邮箱
+     */
+    private String email;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/domain/RosterCertificate.java

@@ -0,0 +1,86 @@
+package com.jeeplus.test.roster.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * roster_certificate
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("roster_certificate")
+public class RosterCertificate extends BaseEntity {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 证书名称
+     */
+    private String certName;
+
+    /**
+     * 证书类型
+     */
+    private String certType;
+
+    /**
+     * 证书编号
+     */
+    private String certNo;
+
+    /**
+     * 发证机构
+     */
+    private String issuedInstitution;
+
+    /**
+     * 发证日期
+     */
+    private Date issuedDate;
+
+    /**
+     * 备案日期
+     */
+    private Date recordDate;
+
+    /**
+     * 提醒日期
+     */
+    private Date remindDate;
+
+    /**
+     * 到期日期
+     */
+    private Date expireDate;
+
+    /**
+     * 专业
+     */
+    private String profession;
+
+    /**
+     * 级别
+     */
+    private String level;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/domain/RosterContract.java

@@ -0,0 +1,61 @@
+package com.jeeplus.test.roster.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * roster_contract
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("roster_contract")
+public class RosterContract extends BaseEntity {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 当前合同起始日
+     */
+    private Date beginDate;
+
+    /**
+     * 当前合同终止日
+     */
+    private Date endDate;
+
+    /**
+     * 工作邮箱
+     */
+    private String workEmail;
+
+    /**
+     * 工作电话
+     */
+    private String workMobile;
+
+    /**
+     * 试用期到期日
+     */
+    private Date probationPeriodEndDate;
+
+    /**
+     * 试用期(月)
+     */
+    private String probationPeriodMonth;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/domain/RosterEducate.java

@@ -0,0 +1,66 @@
+package com.jeeplus.test.roster.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * roster_educate
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("roster_educate")
+public class RosterEducate extends BaseEntity {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 学校
+     */
+    private String collegeName;
+
+    /**
+     * 专业
+     */
+    private String profession;
+
+    /**
+     * 入校时间
+     */
+    private Date entryDate;
+
+    /**
+     * 毕业日期
+     */
+    private Date graduationDate;
+
+    /**
+     * 是否取得学位
+     */
+    private String haveDegree;
+
+    /**
+     * 教育证书照1
+     */
+    private String educationCertFirst;
+
+    /**
+     * 教育证书照2
+     */
+    private String educationCertSecond;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/domain/RosterFamily.java

@@ -0,0 +1,52 @@
+package com.jeeplus.test.roster.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * roster_family
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("roster_family")
+public class RosterFamily extends BaseEntity {
+
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 成员姓名
+     */
+    private String name;
+
+    /**
+     * 关系
+     */
+    private String relationship;
+
+    /**
+     * 出生日期
+     */
+    private Date birthDate;
+
+    /**
+     * 出生证明
+     */
+    private String birthCertificate;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/domain/RosterFiles.java

@@ -0,0 +1,36 @@
+package com.jeeplus.test.roster.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * roster_files
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("roster_files")
+public class RosterFiles extends BaseEntity {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 文件路径
+     */
+    private String url;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/domain/RosterWork.java

@@ -0,0 +1,56 @@
+package com.jeeplus.test.roster.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * roster_work
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("roster_work")
+public class RosterWork extends BaseEntity {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 担任职位
+     */
+    private String posts;
+
+    /**
+     * 入职日期
+     */
+    private Date entryDate;
+
+    /**
+     * 离职日期
+     */
+    private Date separationDate;
+
+    /**
+     * 职位描述
+     */
+    private String postDescription;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/RosterBaseMapper.java

@@ -0,0 +1,20 @@
+package com.jeeplus.test.roster.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.test.rank.service.dto.RankSystemTableDTO;
+import com.jeeplus.test.roster.domain.RosterBase;
+import com.jeeplus.test.roster.service.dto.RosterBaseDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface RosterBaseMapper extends BaseMapper<RosterBase> {
+
+    public IPage<RosterBaseDTO> findList(Page<RosterBaseDTO> page, @Param(Constants.WRAPPER)QueryWrapper<RosterBase> queryWrapper);
+
+    public RosterBaseDTO queryById(@Param("id") String id);
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/RosterCertificateMapper.java

@@ -0,0 +1,9 @@
+package com.jeeplus.test.roster.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.roster.domain.RosterCertificate;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RosterCertificateMapper extends BaseMapper<RosterCertificate> {
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/RosterContractMapper.java

@@ -0,0 +1,9 @@
+package com.jeeplus.test.roster.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.roster.domain.RosterContract;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RosterContractMapper extends BaseMapper<RosterContract> {
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/RosterEducateMapper.java

@@ -0,0 +1,9 @@
+package com.jeeplus.test.roster.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.roster.domain.RosterEducate;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RosterEducateMapper extends BaseMapper<RosterEducate> {
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/RosterFamilyMapper.java

@@ -0,0 +1,9 @@
+package com.jeeplus.test.roster.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.roster.domain.RosterFamily;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RosterFamilyMapper extends BaseMapper<RosterFamily> {
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/RosterFilesMapper.java

@@ -0,0 +1,9 @@
+package com.jeeplus.test.roster.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.roster.domain.RosterFiles;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RosterFilesMapper extends BaseMapper<RosterFiles> {
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/RosterWorkMapper.java

@@ -0,0 +1,9 @@
+package com.jeeplus.test.roster.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.roster.domain.RosterWork;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RosterWorkMapper extends BaseMapper<RosterWork> {
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/xml/RosterBaseMapper.xml

@@ -0,0 +1,113 @@
+<?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.jeeplus.test.roster.mapper.RosterBaseMapper">
+  <resultMap id="BaseResultMap" type="com.jeeplus.test.roster.service.dto.RosterBaseDTO">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy.id" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy.id" />
+    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="office_id" jdbcType="VARCHAR" property="officeId" />
+    <result column="job_position_id" jdbcType="VARCHAR" property="jobPositionId" />
+    <result column="position_id" jdbcType="VARCHAR" property="positionId" />
+    <result column="rank_id" jdbcType="VARCHAR" property="rankId" />
+    <result column="job_no" jdbcType="VARCHAR" property="jobNo" />
+    <result column="certificates_type" jdbcType="VARCHAR" property="certificatesType" />
+    <result column="id_card" jdbcType="VARCHAR" property="idCard" />
+    <result column="certificates_front" jdbcType="VARCHAR" property="certificatesFront" />
+    <result column="certificates_back" jdbcType="VARCHAR" property="certificatesBack" />
+    <result column="mobile" jdbcType="VARCHAR" property="mobile" />
+    <result column="contract_type" jdbcType="VARCHAR" property="contractType" />
+    <result column="worker_type" jdbcType="VARCHAR" property="workerType" />
+    <result column="onboarding_date" jdbcType="TIMESTAMP" property="onboardingDate" />
+    <result column="seniority" jdbcType="VARCHAR" property="seniority" />
+    <result column="contract_company" jdbcType="VARCHAR" property="contractCompany" />
+    <result column="sex" jdbcType="VARCHAR" property="sex" />
+    <result column="birth_date" jdbcType="TIMESTAMP" property="birthDate" />
+    <result column="work_place" jdbcType="VARCHAR" property="workPlace" />
+    <result column="contact_address" jdbcType="VARCHAR" property="contactAddress" />
+    <result column="employment_situation" jdbcType="VARCHAR" property="employmentSituation" />
+    <result column="working_hour" jdbcType="VARCHAR" property="workingHour" />
+    <result column="ethnic" jdbcType="VARCHAR" property="ethnic" />
+    <result column="account_type" jdbcType="VARCHAR" property="accountType" />
+    <result column="account_addr" jdbcType="VARCHAR" property="accountAddr" />
+    <result column="origin" jdbcType="VARCHAR" property="origin" />
+    <result column="live_addr" jdbcType="VARCHAR" property="liveAddr" />
+    <result column="highest_education" jdbcType="VARCHAR" property="highestEducation" />
+    <result column="political_face" jdbcType="VARCHAR" property="politicalFace" />
+    <result column="marital_status" jdbcType="VARCHAR" property="maritalStatus" />
+    <result column="blood_type" jdbcType="VARCHAR" property="bloodType" />
+    <result column="emergency_contact_name" jdbcType="VARCHAR" property="emergencyContactName" />
+    <result column="emergency_contact_tel" jdbcType="VARCHAR" property="emergencyContactTel" />
+    <result column="spouse_name" jdbcType="VARCHAR" property="spouseName" />
+    <result column="child_name" jdbcType="VARCHAR" property="childName" />
+    <result column="qq" jdbcType="VARCHAR" property="qq" />
+    <result column="wechat" jdbcType="VARCHAR" property="wechat" />
+    <result column="email" jdbcType="VARCHAR" property="email" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    rb.id,
+    rb.create_by,
+    rb.create_date,
+    rb.update_by,
+    rb.update_date,
+    rb.remarks,
+    rb.del_flag,
+    rb.`name`,
+    rb.office_id,
+    rb.job_position_id,
+    rb.position_id,
+    rb.rank_id,
+    rb.job_no,
+    rb.certificates_type,
+    rb.id_card,
+    rb.certificates_front,
+    rb.certificates_back,
+    rb.mobile,
+    rb.contract_type,
+    rb.worker_type,
+    rb.onboarding_date,
+    rb.seniority,
+    rb.contract_company,
+    rb.sex,
+    rb.birth_date,
+    rb.work_place,
+    rb.contact_address,
+    rb.employment_situation,
+    rb.working_hour,
+    rb.ethnic,
+    rb.account_type,
+    rb.account_addr,
+    rb.origin,
+    rb.live_addr,
+    rb.highest_education,
+    rb.political_face,
+    rb.marital_status,
+    rb.blood_type,
+    rb.emergency_contact_name,
+    rb.emergency_contact_tel,
+    rb.spouse_name,
+    rb.child_name,
+    rb.qq,
+    rb.wechat,
+    rb.email
+  </sql>
+
+  <select id="findList" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"></include>
+    from roster_base rb
+    ${ew.customSqlSegment}
+  </select>
+
+  <select id="queryById" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"></include>
+    from roster_base rb
+    where rb.id = #{id}
+  </select>
+
+</mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/xml/RosterCertificateMapper.xml

@@ -0,0 +1,31 @@
+<?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.jeeplus.test.roster.mapper.RosterCertificateMapper">
+  <resultMap id="BaseResultMap" type="com.jeeplus.test.roster.service.dto.RosterCertificateDTO">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy.id" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy.id" />
+    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="base_id" jdbcType="VARCHAR" property="baseId" />
+    <result column="cert_name" jdbcType="VARCHAR" property="certName" />
+    <result column="cert_type" jdbcType="VARCHAR" property="certType" />
+    <result column="cert_no" jdbcType="VARCHAR" property="certNo" />
+    <result column="issued_institution" jdbcType="VARCHAR" property="issuedInstitution" />
+    <result column="issued_date" jdbcType="TIMESTAMP" property="issuedDate" />
+    <result column="record_date" jdbcType="TIMESTAMP" property="recordDate" />
+    <result column="remind_date" jdbcType="TIMESTAMP" property="remindDate" />
+    <result column="expire_date" jdbcType="TIMESTAMP" property="expireDate" />
+    <result column="profession" jdbcType="VARCHAR" property="profession" />
+    <result column="level" jdbcType="VARCHAR" property="level" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, create_by, create_date, update_by, update_date, remarks, del_flag, base_id, cert_name, 
+    cert_type, cert_no, issued_institution, issued_date, record_date, remind_date, expire_date, 
+    profession, `level`, description
+  </sql>
+
+</mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/xml/RosterContractMapper.xml

@@ -0,0 +1,25 @@
+<?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.jeeplus.test.roster.mapper.RosterContractMapper">
+  <resultMap id="BaseResultMap" type="com.jeeplus.test.roster.service.dto.RosterContractDTO">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy.id" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy.id" />
+    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="base_id" jdbcType="VARCHAR" property="baseId" />
+    <result column="begin_date" jdbcType="TIMESTAMP" property="beginDate" />
+    <result column="end_date" jdbcType="TIMESTAMP" property="endDate" />
+    <result column="work_email" jdbcType="VARCHAR" property="workEmail" />
+    <result column="work_mobile" jdbcType="VARCHAR" property="workMobile" />
+    <result column="probation_period_end_date" jdbcType="TIMESTAMP" property="probationPeriodEndDate" />
+    <result column="probation_period_month" jdbcType="VARCHAR" property="probationPeriodMonth" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, create_by, create_date, update_by, update_date, remarks, base_id, begin_date, 
+    end_date, work_email, work_mobile, probation_period_end_date, probation_period_month, 
+    del_flag
+  </sql>
+</mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/xml/RosterEducateMapper.xml

@@ -0,0 +1,25 @@
+<?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.jeeplus.test.roster.mapper.RosterEducateMapper">
+  <resultMap id="BaseResultMap" type="com.jeeplus.test.roster.service.dto.RosterEducateDTO">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy.id" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy.id" />
+    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="base_id" jdbcType="VARCHAR" property="baseId" />
+    <result column="college_name" jdbcType="VARCHAR" property="collegeName" />
+    <result column="profession" jdbcType="VARCHAR" property="profession" />
+    <result column="entry_date" jdbcType="TIMESTAMP" property="entryDate" />
+    <result column="graduation_date" jdbcType="TIMESTAMP" property="graduationDate" />
+    <result column="have_degree" jdbcType="VARCHAR" property="haveDegree" />
+    <result column="education_cert_first" jdbcType="VARCHAR" property="educationCertFirst" />
+    <result column="education_cert_second" jdbcType="VARCHAR" property="educationCertSecond" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, create_by, create_date, update_by, update_date, remarks, del_flag, base_id, college_name, 
+    profession, entry_date, graduation_date, have_degree, education_cert_first, education_cert_second
+  </sql>
+</mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/xml/RosterFamilyMapper.xml

@@ -0,0 +1,22 @@
+<?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.jeeplus.test.roster.mapper.RosterFamilyMapper">
+  <resultMap id="BaseResultMap" type="com.jeeplus.test.roster.service.dto.RosterFamilyDTO">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy.id" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy.id" />
+    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="base_id" jdbcType="VARCHAR" property="baseId" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="relationship" jdbcType="VARCHAR" property="relationship" />
+    <result column="birth_date" jdbcType="TIMESTAMP" property="birthDate" />
+    <result column="birth_certificate" jdbcType="VARCHAR" property="birthCertificate" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, create_by, create_date, update_by, update_date, remarks, del_flag, base_id, `name`, 
+    relationship, birth_date, birth_certificate
+  </sql>
+</mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/xml/RosterFilesMapper.xml

@@ -0,0 +1,18 @@
+<?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.jeeplus.test.roster.mapper.RosterFilesMapper">
+  <resultMap id="BaseResultMap" type="com.jeeplus.test.roster.service.dto.RosterFilesDTO">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy.id" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy.id" />
+    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="base_id" jdbcType="VARCHAR" property="baseId" />
+    <result column="url" jdbcType="VARCHAR" property="url" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, create_by, create_date, update_by, update_date, remarks, del_flag, base_id, url
+  </sql>
+</mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/xml/RosterWorkMapper.xml

@@ -0,0 +1,23 @@
+<?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.jeeplus.test.roster.mapper.RosterWorkMapper">
+  <resultMap id="BaseResultMap" type="com.jeeplus.test.roster.service.dto.RosterWorkDTO">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy.id" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy.id" />
+    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="base_id" jdbcType="VARCHAR" property="baseId" />
+    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+    <result column="posts" jdbcType="VARCHAR" property="posts" />
+    <result column="entry_date" jdbcType="TIMESTAMP" property="entryDate" />
+    <result column="separation_date" jdbcType="TIMESTAMP" property="separationDate" />
+    <result column="post_description" jdbcType="VARCHAR" property="postDescription" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, create_by, create_date, update_by, update_date, remarks, del_flag, base_id, company_name, 
+    posts, entry_date, separation_date, post_description
+  </sql>
+</mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/RosterBaseService.java

@@ -0,0 +1,46 @@
+package com.jeeplus.test.roster.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.test.rank.service.dto.RankSystemTableDTO;
+import com.jeeplus.test.roster.domain.RosterBase;
+import com.jeeplus.test.roster.mapper.RosterBaseMapper;
+import com.jeeplus.test.roster.service.dto.RosterBaseDTO;
+import com.jeeplus.test.roster.service.mapstruct.RosterBaseWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class RosterBaseService extends ServiceImpl<RosterBaseMapper, RosterBase> {
+
+    @Autowired
+    private RosterBaseMapper rosterBaseMapper;
+
+    public IPage<RosterBaseDTO> findList(Page<RosterBaseDTO> page, QueryWrapper<RosterBase> queryWrapper){
+        queryWrapper.eq("rb.del_flag","0");
+        return rosterBaseMapper.findList(page,queryWrapper);
+    }
+
+    public RosterBaseDTO queryById(String id){
+        return rosterBaseMapper.queryById(id);
+    }
+
+    public ResponseEntity saveRoster(RosterBaseDTO rosterBaseDTO){
+        RosterBase rosterBase = RosterBaseWrapper.INSTANCE.toEntity(rosterBaseDTO);
+
+        if(ObjectUtil.isNotEmpty(rosterBaseDTO)){
+            if(StrUtil.isNotEmpty(rosterBaseDTO.getId())){
+
+            }
+        }
+        this.saveOrUpdate(rosterBase);
+        return ResponseEntity.ok("花名册保存成功");
+    }
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/dto/RosterBaseDTO.java

@@ -0,0 +1,215 @@
+package com.jeeplus.test.roster.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * roster_base
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RosterBaseDTO extends BaseDTO {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 部门id
+     */
+    private String officeId;
+
+    /**
+     * 职位id
+     */
+    private String jobPositionId;
+
+    /**
+     * 职务id
+     */
+    private String positionId;
+
+    /**
+     * 职级id
+     */
+    private String rankId;
+
+    /**
+     * 工号
+     */
+    private String jobNo;
+
+    /**
+     * 证件类型
+     */
+    private String certificatesType;
+
+    /**
+     * 证件号
+     */
+    private String idCard;
+
+    /**
+     * 证件照正面
+     */
+    private String certificatesFront;
+
+    /**
+     * 证件照反面
+     */
+    private String certificatesBack;
+
+    /**
+     * 手机号码
+     */
+    private String mobile;
+
+    /**
+     * 合同类型
+     */
+    private String contractType;
+
+    /**
+     * 员工类型
+     */
+    private String workerType;
+
+    /**
+     * 入职日期
+     */
+    private Date onboardingDate;
+
+    /**
+     * 历史工龄
+     */
+    private String seniority;
+
+    /**
+     * 合同公司
+     */
+    private String contractCompany;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    private Date birthDate;
+
+    /**
+     * 工作地点
+     */
+    private String workPlace;
+
+    /**
+     * 联系地址
+     */
+    private String contactAddress;
+
+    /**
+     * 入职年度就业情形
+     */
+    private String employmentSituation;
+
+    /**
+     * 工时制度
+     */
+    private String workingHour;
+
+    /**
+     * 民族
+     */
+    private String ethnic;
+
+    /**
+     * 户口类型
+     */
+    private String accountType;
+
+    /**
+     * 户口所在地
+     */
+    private String accountAddr;
+
+    /**
+     * 籍贯
+     */
+    private String origin;
+
+    /**
+     * 居住地址
+     */
+    private String liveAddr;
+
+    /**
+     * 最高学历
+     */
+    private String highestEducation;
+
+    /**
+     * 政治面貌
+     */
+    private String politicalFace;
+
+    /**
+     * 婚姻状况
+     */
+    private String maritalStatus;
+
+    /**
+     * 血型
+     */
+    private String bloodType;
+
+    /**
+     * 紧急联系人姓名
+     */
+    private String emergencyContactName;
+
+    /**
+     * 紧急联系人电话
+     */
+    private String emergencyContactTel;
+
+    /**
+     * 配偶姓名
+     */
+    private String spouseName;
+
+    /**
+     * 孩子姓名
+     */
+    private String childName;
+
+    /**
+     * QQ
+     */
+    private String qq;
+
+    /**
+     * 微信
+     */
+    private String wechat;
+
+    /**
+     * 个人邮箱
+     */
+    private String email;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/dto/RosterCertificateDTO.java

@@ -0,0 +1,85 @@
+package com.jeeplus.test.roster.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * roster_certificate
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RosterCertificateDTO extends BaseDTO {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 证书名称
+     */
+    private String certName;
+
+    /**
+     * 证书类型
+     */
+    private String certType;
+
+    /**
+     * 证书编号
+     */
+    private String certNo;
+
+    /**
+     * 发证机构
+     */
+    private String issuedInstitution;
+
+    /**
+     * 发证日期
+     */
+    private Date issuedDate;
+
+    /**
+     * 备案日期
+     */
+    private Date recordDate;
+
+    /**
+     * 提醒日期
+     */
+    private Date remindDate;
+
+    /**
+     * 到期日期
+     */
+    private Date expireDate;
+
+    /**
+     * 专业
+     */
+    private String profession;
+
+    /**
+     * 级别
+     */
+    private String level;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/dto/RosterContractDTO.java

@@ -0,0 +1,60 @@
+package com.jeeplus.test.roster.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * roster_contract
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RosterContractDTO extends BaseDTO {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 当前合同起始日
+     */
+    private Date beginDate;
+
+    /**
+     * 当前合同终止日
+     */
+    private Date endDate;
+
+    /**
+     * 工作邮箱
+     */
+    private String workEmail;
+
+    /**
+     * 工作电话
+     */
+    private String workMobile;
+
+    /**
+     * 试用期到期日
+     */
+    private Date probationPeriodEndDate;
+
+    /**
+     * 试用期(月)
+     */
+    private String probationPeriodMonth;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/dto/RosterEducateDTO.java

@@ -0,0 +1,65 @@
+package com.jeeplus.test.roster.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * roster_educate
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RosterEducateDTO extends BaseDTO {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 学校
+     */
+    private String collegeName;
+
+    /**
+     * 专业
+     */
+    private String profession;
+
+    /**
+     * 入校时间
+     */
+    private Date entryDate;
+
+    /**
+     * 毕业日期
+     */
+    private Date graduationDate;
+
+    /**
+     * 是否取得学位
+     */
+    private String haveDegree;
+
+    /**
+     * 教育证书照1
+     */
+    private String educationCertFirst;
+
+    /**
+     * 教育证书照2
+     */
+    private String educationCertSecond;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/dto/RosterFamilyDTO.java

@@ -0,0 +1,50 @@
+package com.jeeplus.test.roster.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * roster_family
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RosterFamilyDTO extends BaseDTO {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 成员姓名
+     */
+    private String name;
+
+    /**
+     * 关系
+     */
+    private String relationship;
+
+    /**
+     * 出生日期
+     */
+    private Date birthDate;
+
+    /**
+     * 出生证明
+     */
+    private String birthCertificate;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/dto/RosterFilesDTO.java

@@ -0,0 +1,35 @@
+package com.jeeplus.test.roster.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * roster_files
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RosterFilesDTO extends BaseDTO {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 文件路径
+     */
+    private String url;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/dto/RosterWorkDTO.java

@@ -0,0 +1,55 @@
+package com.jeeplus.test.roster.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * roster_work
+ * @author 
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RosterWorkDTO extends BaseDTO {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 担任职位
+     */
+    private String posts;
+
+    /**
+     * 入职日期
+     */
+    private Date entryDate;
+
+    /**
+     * 离职日期
+     */
+    private Date separationDate;
+
+    /**
+     * 职位描述
+     */
+    private String postDescription;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/mapstruct/RosterBaseWrapper.java

@@ -0,0 +1,17 @@
+package com.jeeplus.test.roster.service.mapstruct;
+
+import com.jeeplus.core.mapstruct.EntityWrapper;
+import com.jeeplus.test.rank.domain.RankRsOffice;
+import com.jeeplus.test.rank.service.dto.RankRsOfficeDTO;
+import com.jeeplus.test.roster.domain.RosterBase;
+import com.jeeplus.test.roster.service.dto.RosterBaseDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE, uses = {})
+public interface RosterBaseWrapper extends EntityWrapper<RosterBaseDTO, RosterBase> {
+
+    RosterBaseWrapper INSTANCE = Mappers.getMapper(RosterBaseWrapper.class);
+
+}