员工信息-01

pom.xml

@@ -169,6 +169,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>

src/main/java/com/chinaitop/depot/basic/controller/DRyxxsjyController.java

@@ -0,0 +1,43 @@
+package com.chinaitop.depot.basic.controller;
+
+import com.chinaitop.depot.basic.model.DRyxxsjyVO;
+import com.chinaitop.depot.basic.param.DRyxxsjyPageParam;
+import com.chinaitop.depot.basic.service.DRyxxsjyService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+/**
+ * @author qingsong.han
+ * @description: 查询员工信息-市平台
+ * @create 2024-11-21 17:44
+ */
+@RestController
+@RequestMapping(value = "/DRyxxsjyController")
+@Api(value= "DRyxxsjyController", description = "员工信息管理")
+public class DRyxxsjyController {
+    @Resource
+    private DRyxxsjyService dRyxxsjyService;
+
+    @GetMapping("/getPageList")
+    @ApiOperation(value="查询员工信息列表", notes = "支持分页")
+    public PageInfo<DRyxxsjyVO> getPageList(@Valid DRyxxsjyPageParam pageParam) {
+        PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());
+        return new PageInfo<>(dRyxxsjyService.getPageList(pageParam));
+    }
+
+    @GetMapping("/getById/{rybh}")
+    @ApiOperation(value="查询员工信息详情", notes = "rybh")
+    public DRyxxsjyVO getById(@PathVariable("rybh") String rybh) {
+        return dRyxxsjyService.getById(rybh);
+    }
+
+}

src/main/java/com/chinaitop/depot/basic/mapper/DRyxxsjyMapper.java

@@ -0,0 +1,34 @@
+package com.chinaitop.depot.basic.mapper;
+
+import com.chinaitop.depot.basic.model.DRyxxsjyVO;
+import com.chinaitop.depot.basic.model.vo.*;
+import com.chinaitop.depot.basic.param.DRyxxsjyPageParam;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-21 20:06
+ */
+@Repository
+public interface DRyxxsjyMapper {
+    List<DRyxxsjyVO> getPageList(DRyxxsjyPageParam pageParam);
+
+    DRyxxsjyVO getById(String rybh);
+
+    List<EducationVO> getQuanById(String rybh);
+
+    List<FeiEducationVO> getFeiById(String rybh);
+
+    List<RotaterotateVO> getRotaterotateById(String rybh);
+
+    List<SkillVO> getSkillListById(String rybh);
+
+    List<ReportVO> getReportListById(String rybh);
+
+    List<CertificatesVO> getCertificatesListById(String rybh);
+
+    List<ZwlxbgjlVO> getZwlxbgjlListById(String sfzh);
+}

src/main/java/com/chinaitop/depot/basic/mapper/DRyxxsjyMapper.xml

@@ -0,0 +1,138 @@
+<?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.chinaitop.depot.basic.mapper.DRyxxsjyMapper">
+    <select id="getPageList" parameterType="com.chinaitop.depot.basic.param.DRyxxsjyPageParam" resultType="com.chinaitop.depot.basic.model.DRyxxsjyVO">
+        select
+            ry.rybh,
+            ry.ryxm,
+            ry.xb,
+            ry.lxdh,
+            zwlx.zwlx,
+            ry.qymc
+        from
+          base:d_ryxxsjy ry
+        left join base:d_ryzwlxb zwlx on zwlx.rysfzh = ry.sfzh and zwlx.qymc = ry.qymc
+        left join base:d_kdxxsjy kd on ry.kddm = kd.kddm
+        inner join org_info oi on kd.kqdm = oi.kqbm
+        <where>
+            oi.org_id = #{orgId}
+            and ry.status = 1
+            and ry.newly = 1
+            <if test="ryxm != null and ryxm != ''">
+                ry.ryxm like '%'||#{ryxm}||'%'
+            </if>
+        </where>
+        order by
+            ry.RYBH desc
+    </select>
+    <select id="getById" parameterType="string" resultType="com.chinaitop.depot.basic.model.DRyxxsjyVO">
+        select
+           ry.sfzh,
+           ry.ryxm,
+           zwlx.zwlx,
+           ry.xb,
+           ry.mz,
+           ry.zzmm,
+           ry.lxdh,
+           ry.bmmc,
+           ry.zwmc,
+           zwlx.zgzt,
+           ry.rylb,
+           ry.gwxz,
+           ry.gwdm,
+           ry.rzrq,
+           ry.cjslqygzsj,
+           ry.cjgzsj,
+           ry.zgzc,
+           ry.zgzctqsj,
+           ry.rotaterotate_type rotaterotateType,
+           ry.head
+        from
+            base:d_ryxxsjy ry
+        left join base:d_ryzwlxb zwlx on zwlx.rysfzh = ry.sfzh and zwlx.qymc = ry.qymc
+        where ry.rybh = #{rybh}
+    </select>
+    <select id="getQuanById" parameterType="string" resultType="com.chinaitop.depot.basic.model.vo.EducationVO">
+        select
+            quan_highest_education quanHighestEducation,
+            quan_institutions quanInstitutions,
+            quan_speciality quanSpeciality,
+            quan_foodstuff quanFoodstuff
+        from
+            base:d_education
+        where rybh = #{rybh}
+    </select>
+    <select id="getFeiById" parameterType="string" resultType="com.chinaitop.depot.basic.model.vo.FeiEducationVO">
+        select
+            fei_highest_education feiHighestEducation,
+            fei_institutions feiInstitutions,
+            fei_speciality feiSpeciality,
+            fei_foodstuff feiFoodstuff
+        from
+            base:d_feieducation
+        where
+            rybh = #{rybh}
+    </select>
+    <select id="getRotaterotateById" parameterType="string" resultType="com.chinaitop.depot.basic.model.vo.RotaterotateVO">
+        select
+            business_type businessType,
+            business_time businessTime,
+            serial_number serialNumber
+        from
+            base:d_rotaterotate
+        where
+            rybh = #{rybh}
+    </select>
+    <select id="getSkillListById" parameterType="string" resultType="com.chinaitop.depot.basic.model.vo.SkillVO">
+        select
+            skill_level skillLevel,
+            skill_name skillName,
+            skill_date skillDate
+        from
+            base:d_skill
+        where
+            rybh = #{rybh}
+    </select>
+    <select id="getReportListById" parameterType="string" resultType="com.chinaitop.depot.basic.model.vo.ReportVO">
+        select
+            honorary_name honoraryName,
+            title,
+            report_number reportNumber,
+            authoritys,
+            release_time releaseTime,
+            honorary_title honoraryTitle,
+            report_name reportName,
+            occupation,
+            fjid
+        from
+            base:d_report
+        where
+            rybh = #{rybh}
+    </select>
+    <select id="getCertificatesListById" parameterType="string" resultType="com.chinaitop.depot.basic.model.vo.CertificatesVO">
+        select
+            speciality,
+            issuefacility,
+            acquisition_time acquisitionTime,
+            fjid
+        from
+            base:d_certificates
+        where
+            rybh = #{rybh}
+    </select>
+    <select id="getZwlxbgjlListById" parameterType="string" resultType="com.chinaitop.depot.basic.model.vo.ZwlxbgjlVO">
+        select
+            zw.bgqzzdwmc,
+            zwlx.zwlx zwlxQ,
+            zw.bghzzdwmc,
+            zwlx1.zwlx zwlxH,
+            zw.bgr,
+            zw.bgfsrq
+        from
+            base:d_zwlxbgjl zw
+            left join base:d_ryzwlxb zwlx on zwlx.rysfzh = zw.bgqzzdwtyshxydm and zwlx.tyshxydm = zw.bgqzzdwtyshxydm
+            left join base:d_ryzwlxb zwlx1 on zwlx1.rysfzh = zw.bgqzzdwtyshxydm and zwlx1.tyshxydm = zw.bgqzzdwtyshxydm
+        where
+            zw.rysfzh = #{sfzh}
+    </select>
+</mapper>

src/main/java/com/chinaitop/depot/basic/model/DRyxxsjyVO.java

@@ -0,0 +1,338 @@
+package com.chinaitop.depot.basic.model;
+
+import java.util.Date;
+import java.util.List;
+
+import com.chinaitop.depot.basic.model.vo.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+
+/**
+ * @author qingsong.han
+ * @description: 查询员工信息-市平台
+ * @create 2024-11-21 17:44
+ */
+
+@SuppressWarnings("serial")
+@Getter
+@Setter
+@ApiModel("人员信息实体类")
+public class DRyxxsjyVO {
+
+	/**
+	 * 人员编号（库点编码+001 三位序号）
+	 */
+	@ApiModelProperty(value = "人员编号",example = "eg:911202236794497949086020  长度30")
+	private String rybh;
+
+	/**
+	 * 人员姓名
+	 */
+	@ApiModelProperty(value = "人员姓名",example = "eg:罗济亚  长度20")
+	private String ryxm;
+	/**
+	 * 所属库点编号
+	 */
+	@ApiModelProperty(value = "库点编号",example = "eg:911202236794497949086  长度30")
+	private String kddm;
+
+	/**
+	 * 所属库点名称
+	 */
+	@ApiModelProperty(value = "库点名称")
+	private String kdmc;
+
+	/**
+	 *身份证号
+	 */
+	@ApiModelProperty(value = "身份证号",example = "eg:911202236794497949086  长度18")
+	private String sfzh;
+
+	/**
+	 *  性别
+	 */
+	@ApiModelProperty(value = "性别",example = "eg:男  长度6")
+	private String xb;
+
+	/**
+	 * 籍贯
+	 */
+	@ApiModelProperty(value = "籍贯",example = "eg:籍贯  长度64")
+	private String jg;
+
+	/**
+	 * 民族
+	 */
+	@ApiModelProperty(value = "民族",example = "eg:汉  长度30")
+	private String mz;
+
+	/**
+	 * 出生时间
+	 */
+	@ApiModelProperty(value = "出生时间",example = "eg:911202236794497949086  长度30")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	private Date cssj;
+
+	/**
+	 * 参加工作时间
+	 */
+	@ApiModelProperty(value = "参加工作时间",example = "eg:911202236794497949086  长度30")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	private Date cjgzsj;
+
+	/**
+	 * 文化程度，40：高中，41：中专，42：大专，43：本科，44：研究生，45：博士，46：博士后
+	 */
+	@ApiModelProperty(value = "文化程度，40：高中，41：中专，42：大专，43：本科，44：研究生，45：博士，46：博士后",example = "eg:本科  长度20")
+	private Integer whcd;
+
+	/**
+	 * 学习专业
+	 */
+	@ApiModelProperty(value = "学习专业",example = "eg:管理专业  长度20")
+	private String xxzy;
+
+	/**
+	 * 政治面貌，111：共产党员，112：共青团员，113：民主党派，114：群众
+	 */
+	@ApiModelProperty(value = " 政治面貌，111：共产党员，112：共青团员，113：民主党派，114：群众",example = "eg:党员  长度20")
+	private String zzmm;
+
+	/**
+	 * 职务代码
+	 */
+	@ApiModelProperty(value = "职务代码",example = "eg:911202236  长度18")
+	private String zwdm;
+
+	/**
+	 * 职务名称
+	 */
+	@ApiModelProperty(value = " 职务名称",example = "eg:管理岗位  长度64")
+	private String zwmc;
+
+	/**
+	 * 部门编码
+	 */
+	@ApiModelProperty(value = "部门编码",example = "eg:911202236794497949086  长度30")
+	private String bmdm;
+
+	/**
+	 * 部门班代码
+	 */
+	@ApiModelProperty(value = "部门班代码",example = "eg:adasd  长度6")
+	private String bmbdm;
+
+	/**
+	 * 部门组代码
+	 */
+	@ApiModelProperty(value = "部门组代码",example = "eg:asdasd  长度6")
+	private String bmzdm;
+
+	/**
+	 * 在岗情况代码
+	 */
+	@ApiModelProperty(value = "在岗情况代码",example = "eg:9112022367  长度18")
+	private String zgqkdm;
+
+	/**
+	 * 岗位代码，11：后勤，12：业务，13：财务，14：统计，15：仓储，16：化验，17：管理，18：防治，19：保安，20：其他
+	 */
+	@ApiModelProperty("岗位代码，11：后勤，12：业务，13：财务，14：统计，15：仓储，16：化验，17：管理，18：防治，19：保安，20：其他")
+	private Integer gwdm;
+
+	/**
+	 * 技术职称代码，401：仓储管理员，402：农产品检验员，403：其他
+	 */
+	@ApiModelProperty(value = "技术职称代码，401：仓储管理员，402：农产品检验员，403：其他",example = "eg:7949086  长度18")
+	private String jszcdm;
+
+	/**
+	 * 技术职称
+	 */
+	@ApiModelProperty(value = "技术职称",example = "eg:string  长度30")
+	private String jszcmc;
+
+	/**
+	 *联系电话
+	 */
+	@ApiModelProperty(value = "联系电话",example = "eg:911202236794  长度30")
+	private String lxdh;
+
+	/**
+	 * 具备证书
+	 */
+	@ApiModelProperty(value = "具备证书",example = "eg:911202236794497949086  长度200")
+	private String jbzs;
+
+	/**
+	 * 发证单位
+	 */
+	@ApiModelProperty(value = "发证单位",example = "eg:911202236794497949086  长度120")
+	private String fzdw;
+
+	@ApiModelProperty(value = "是否备案，0，未备案，1，待提交，2待审核，3已驳回，4，已备案", notes ="是否备案，0，未备案，1，待提交，2待审核，3已驳回，4，已备案", required = false)
+	private Integer sfba;
+
+	@ApiModelProperty(value = "固定电话", notes ="固定电话", required = false,example = "123342  30")
+	private String gddh;
+
+	@ApiModelProperty(value = "电子邮箱", notes ="电子邮箱", required = false,example = "123342@qq.com  30")
+	private String dzyx;
+
+	@ApiModelProperty(value = "教育形式，1：全日制，2：非全日制，3：函授", notes ="教育形式，1：全日制，2：非全日制，3：函授", required = false)
+	private Integer jyxs;
+
+	@ApiModelProperty(value = "毕业院校", notes ="毕业院校", required = false,example = "毕业院校  60")
+	private String byyx;
+
+	@ApiModelProperty(value = "学位", notes ="学位", required = false,example = "学位  18")
+	private String xw;
+
+	@ApiModelProperty(value = "职称（等级），1：初级，2：中级，3：高级", notes ="职称（等级），1：初级，2：中级，3：高级", required = false)
+	private Integer zcdj;
+
+	@ApiModelProperty(value = "颁证时间", notes ="颁证时间", required = false,example = "2019-09-30 00:00:00  Date_time")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	private Date bzsj;
+
+	@ApiModelProperty(value = "其他专业", notes ="其他专业", required = false,example = "其他专业  20")
+	private String qtzy;
+
+	@ApiModelProperty(value = "其他颁证机构", notes ="其他颁证机构", required = false,example = "其他颁证机构  30")
+	private String qtbzjg;
+
+	@ApiModelProperty(value = "其他颁证时间", notes ="其他颁证时间", required = false,example = "2019-09-30 00:00:00  Date_time")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	private Date qtbzsj;
+
+	@ApiModelProperty(value = "所属企业代码（统一社会信用代码）", notes ="所属企业代码（统一社会信用代码）", required = false)
+	private String tyshxydm;
+
+	@ApiModelProperty(value = "所属企业名称", notes ="所属企业名称", required = false,example = "所属企业名称  100")
+	private String qymc;
+
+	@ApiModelProperty(value = "启用状态，1：启用，0：禁用", notes ="启用状态，1：启用，0：禁用", required = false)
+	private Integer qyzt;
+
+    @ApiModelProperty(value = "个人简介", notes ="个人简介", required = false)
+    private String grjj ;
+
+    @ApiModelProperty(value = "附件", notes ="附件", required = false)
+    private String clfj ;
+
+    @ApiModelProperty(value = "行政区划代码", notes ="引用GB/T 2260-2007年区划代码，由6位阿拉伯数字组成", required = false)
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "人员类别", notes ="1100:公务员 1200:事业单位管理人员 1300:企业经营管理人员 1400:专业技术人员1410:高级职称1411:正高级职称 1420：中级职称 1430:初级及以下职称 1431主要专职保管人员  1432 主要专职检化验人员 1500:工人 1510:技术工人 1511:高级技师 1512:技师 1513:高级工 1514:中级工 1515:初级工", required = false)
+    private String rylb;
+
+    @ApiModelProperty(value = "操作标志", notes ="i:新增数据（默认）u:更新数据 d:删除数据", required = false)
+    private String czbz;
+
+    @ApiModelProperty(value = "部门名称", notes ="", required = false)
+    private String bmmc;
+
+    @ApiModelProperty(value = "入职日期", notes ="", required = false)
+    private String rzrq;
+
+    @ApiModelProperty(value = "岗位性质", notes ="岗位性质", required = false)
+    private String gwxz;
+
+    @ApiModelProperty(value = "荣誉称号", notes = "荣誉称号", required = false)
+    private String rych;
+
+    @ApiModelProperty(value = "授予单位层级  1:国家级 2:省市级 3:区级 4:其他", notes = " 1:国家级 2:省市级 3:区级 4:其他", required = false)
+    private String rysydwcj;
+
+    @ApiModelProperty(value = "授予单位名称", notes = "授予单位名称", required = false)
+    private String rysydwmc;
+
+    @ApiModelProperty(value = "是否为粮食领域", notes = "是否为粮食领域", required = false)
+    private String lsly;
+
+    @ApiModelProperty(value = "获得奖项时间", notes = "获得奖项时间", required = false, example = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date ryhqsj;
+
+    @ApiModelProperty(value = "荣誉证书附件", notes = "荣誉证书附件", required = false)
+    private String ryfj;
+
+	@ApiModelProperty("明细ID")
+	private String mxId;
+
+	// 是否新增 newly
+	@ApiModelProperty(value = "是否新增", notes = "是否新增", required = false)
+	private String newly;
+
+	// postType
+	@ApiModelProperty(value = "岗位角色", notes = "岗位角色", required = false)
+	private String postType;
+
+	// avatorUrl，职工头像
+	@ApiModelProperty(value = "职工头像", notes = "职工头像", required = false)
+	private String avatorUrl;
+
+	// 参加涉粮企业工作时间,cjslqygzsj
+	@ApiModelProperty(value = "参加涉粮企业工作时间", notes = "参加涉粮企业工作时间", required = false)
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date cjslqygzsj;
+
+	// 人员性质,ryxz
+	@ApiModelProperty(value = "人员性质,1，库级人员；2，购销公司新增；3，外部单位人员",
+			notes = "人员性质,1，库级人员；2，购销公司新增；3，外部单位人员", required = false)
+	private String ryxz;
+
+	@ApiModelProperty(value = "是否涉及交流轮岗", notes = "是否涉及交流轮岗", required = false)
+	private String rotaterotateType;
+
+	// 领导板子成员/关键部门负责人,head
+	@ApiModelProperty(value = "领导板子成员/关键部门负责人", notes = "领导板子成员/关键部门负责人", required = false)
+	private String head;
+
+	@ApiModelProperty(value = "是否外部单位")
+	private String unittype;
+
+	@ApiModelProperty(value = "最高职称", notes = "最高职称", required = false)
+	private String zgzc;
+
+	@ApiModelProperty(value = "取得最高职称或职业资格时间", notes = "取得最高职称或职业资格时间", required = false)
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date zgzctqsj;
+
+	// 职务类型，0:主职，1:副职
+	private String zwlx;
+
+	// orgCode
+	@ApiModelProperty(value = "组织机构代码", notes = "组织机构代码", required = false)
+	private String orgCode;
+
+	// 子表
+	@ApiModelProperty(value = "学历学位情况/全日制")
+	private List<EducationVO> educationVOList;
+	@ApiModelProperty(value = "学历学位情况/非全日制")
+	private List<FeiEducationVO> feiEducationVOList;
+	@ApiModelProperty(value = "是否涉及交流轮岗")
+	private List<RotaterotateVO> rotaterotateVOList;
+	@ApiModelProperty(value = "技能等级")
+	private List<SkillVO> skillVOList;
+	@ApiModelProperty(value = "职称和荣誉称号")
+	private List<ReportVO> reportVOList;
+	@ApiModelProperty(value = "上岗其它证书")
+	private List<CertificatesVO> certificatesVOList;
+	@ApiModelProperty(value = "其它附件")
+	private List<Object> otherVoList;
+	@ApiModelProperty(value = "职务类型变更记录")
+	private List<ZwlxbgjlVO> ZwlxbgjlVOVOList;
+}

src/main/java/com/chinaitop/depot/basic/model/DryzwlxbVO.java

@@ -0,0 +1,57 @@
+package com.chinaitop.depot.basic.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+
+/**
+ * @author qingsong.han
+ * @description: 查询员工信息-市平台
+ * @create 2024-11-21 17:44
+ */
+@Data
+public class DryzwlxbVO {
+
+    // id
+    private String id;
+
+    // 人员身份证号
+    private String rysfzh;
+
+    // 职务类型，0:主职，1:副职
+    private String zwlx;
+
+    // 所属企业名称
+    private String qymc;
+
+    // 企业统一社会信用代码
+    private String tyshxydm;
+
+    // 创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+      // 启用状态，0:禁用，1:启用
+    @ApiModelProperty(value = "启用状态，0:禁用，1:启用")
+    private Integer qyzt;
+
+    // 入职日期
+    @ApiModelProperty(value = "入职日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date rzrq;
+
+    // 在岗状态：在职，已离职
+    private String zgzt;
+
+    // 排除企业名称(在管理端查询在其他单位任职的时候使用)
+    @ApiModelProperty(value = "排除企业名称")
+    private String excludeQymc;
+
+     // 人员组ID
+    @ApiModelProperty(value = "人员组ID")
+    private String groupId;
+}

src/main/java/com/chinaitop/depot/basic/model/vo/CertificatesVO.java

@@ -0,0 +1,24 @@
+package com.chinaitop.depot.basic.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-22 16:47
+ */
+@Data
+public class CertificatesVO {
+    // 专业
+    private String speciality;
+    // 颁证机构
+    private String issueFacility;
+    // 颁证年月
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date acquisitionTime;
+    // 证书附件
+    private String fjid;
+}

src/main/java/com/chinaitop/depot/basic/model/vo/EducationVO.java

@@ -0,0 +1,25 @@
+package com.chinaitop.depot.basic.model.vo;
+
+import lombok.Data;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-22 16:46
+ */
+@Data
+public class EducationVO {
+
+    // 全日制最高学历
+    private String quanHighestEducation;
+
+    // 毕业院校
+    private String quanInstitutions;
+
+    // 专业
+    private String quanSpeciality;
+
+    // 是否为涉粮专业
+    private String quanFoodstuff;
+
+}

src/main/java/com/chinaitop/depot/basic/model/vo/FeiEducationVO.java

@@ -0,0 +1,24 @@
+package com.chinaitop.depot.basic.model.vo;
+
+import lombok.Data;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-22 16:46
+ */
+@Data
+public class FeiEducationVO {
+
+    // 非全日制最高学历
+    private String feiHighestEducation;
+
+    // 毕业院校
+    private String feiInstitutions;
+
+    // 专业
+    private String feiSpeciality;
+
+    // 是否为涉粮专业
+    private String feiFoodstuff;
+}

src/main/java/com/chinaitop/depot/basic/model/vo/ReportVO.java

@@ -0,0 +1,35 @@
+package com.chinaitop.depot.basic.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-22 16:47
+ */
+@Data
+public class ReportVO {
+
+    // 职业资格证书名称
+    private String honoraryName;
+    // 职称（等级）
+    private String title;
+    // 证书编号
+    private String reportNumber;
+    // 颁证机构
+    private String authoritys;
+    // 颁证年月
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date releaseTime;
+    // 荣誉称号
+    private String honoraryTitle;
+    // 专业
+    private String reportName;
+    // 专业明细
+    private String occupation;
+    // 证书附件
+    private String fjid;
+}

src/main/java/com/chinaitop/depot/basic/model/vo/RotaterotateVO.java

@@ -0,0 +1,19 @@
+package com.chinaitop.depot.basic.model.vo;
+
+import lombok.Data;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-22 16:47
+ */
+@Data
+public class RotaterotateVO {
+
+    // 业务类型
+    private String businessType;
+    // 业务时间
+    private String businessTime;
+    // 文件编号
+    private String serialNumber;
+}

src/main/java/com/chinaitop/depot/basic/model/vo/SkillVO.java

@@ -0,0 +1,22 @@
+package com.chinaitop.depot.basic.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-22 16:47
+ */
+@Data
+public class SkillVO {
+    // 技能等级
+    private String skillLevel;
+    // 专业
+    private String skillName;
+    // 获取时间
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date skillDate;
+}

src/main/java/com/chinaitop/depot/basic/model/vo/ZwlxbgjlVO.java

@@ -0,0 +1,12 @@
+package com.chinaitop.depot.basic.model.vo;
+
+import lombok.Data;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-22 16:48
+ */
+@Data
+public class ZwlxbgjlVO {
+}

src/main/java/com/chinaitop/depot/basic/param/DRyxxsjyPageParam.java

@@ -0,0 +1,25 @@
+package com.chinaitop.depot.basic.param;
+
+import com.chinaitop.depot.common.util.PageParam;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-21 17:58
+ */
+@Getter @Setter
+public class DRyxxsjyPageParam extends PageParam implements Serializable {
+    private static final long serialVersionUID = -7265063502324094512L;
+
+    // 机构编码
+    @NotNull(message = "orgId非空")
+    private Integer orgId;
+    // 员工名称
+    private String ryxm;
+
+}

src/main/java/com/chinaitop/depot/basic/service/DRyxxsjyService.java

@@ -0,0 +1,17 @@
+package com.chinaitop.depot.basic.service;
+
+import com.chinaitop.depot.basic.model.DRyxxsjyVO;
+import com.chinaitop.depot.basic.param.DRyxxsjyPageParam;
+
+import java.util.List;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-21 20:05
+ */
+public interface DRyxxsjyService {
+    List<DRyxxsjyVO> getPageList(DRyxxsjyPageParam pageParam);
+
+    DRyxxsjyVO getById(String rybh);
+}

src/main/java/com/chinaitop/depot/basic/service/impl/DRyxxsjyServiceImpl.java

@@ -0,0 +1,75 @@
+package com.chinaitop.depot.basic.service.impl;
+
+import com.chinaitop.depot.basic.mapper.DRyxxsjyMapper;
+import com.chinaitop.depot.basic.model.DRyxxsjyVO;
+import com.chinaitop.depot.basic.model.vo.*;
+import com.chinaitop.depot.basic.param.DRyxxsjyPageParam;
+import com.chinaitop.depot.basic.service.DRyxxsjyService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-21 20:05
+ */
+@Service
+public class DRyxxsjyServiceImpl implements DRyxxsjyService {
+    @Resource
+    private DRyxxsjyMapper dRyxxsjyMapper;
+
+    @Override
+    public List<DRyxxsjyVO> getPageList(DRyxxsjyPageParam pageParam) {
+        return dRyxxsjyMapper.getPageList(pageParam);
+    }
+
+    @Override
+    public DRyxxsjyVO getById(String rybh) {
+        DRyxxsjyVO dRyxxsjyVO = dRyxxsjyMapper.getById(rybh);
+        if (ObjectUtils.isEmpty(dRyxxsjyVO)) {
+            return dRyxxsjyVO;
+        }
+        // 学历学位情况
+        // 全日制
+        List<EducationVO> educationVOList = dRyxxsjyMapper.getQuanById(rybh);
+        if (!CollectionUtils.isEmpty(educationVOList)) {
+            dRyxxsjyVO.setEducationVOList(educationVOList);
+        }
+        // 非全日制
+        List<FeiEducationVO> feiEducationVOList = dRyxxsjyMapper.getFeiById(rybh);
+        if (!CollectionUtils.isEmpty(feiEducationVOList)) {
+            dRyxxsjyVO.setFeiEducationVOList(feiEducationVOList);
+        }
+        // 是否涉及交流轮岗
+        List<RotaterotateVO> rotaterotateVOList = dRyxxsjyMapper.getRotaterotateById(rybh);
+        if (!CollectionUtils.isEmpty(rotaterotateVOList)) {
+            dRyxxsjyVO.setRotaterotateVOList(rotaterotateVOList);
+        }
+        // 技能等级
+        List<SkillVO> skillVOList = dRyxxsjyMapper.getSkillListById(rybh);
+        if (!CollectionUtils.isEmpty(skillVOList)) {
+            dRyxxsjyVO.setSkillVOList(skillVOList);
+        }
+        // 职称和荣誉称号
+        List<ReportVO> reportVOList = dRyxxsjyMapper.getReportListById(rybh);
+        if (!CollectionUtils.isEmpty(reportVOList)) {
+            dRyxxsjyVO.setReportVOList(reportVOList);
+        }
+        // 上岗其它证书
+        List<CertificatesVO> certificatesVOList = dRyxxsjyMapper.getCertificatesListById(rybh);
+        if (!CollectionUtils.isEmpty(certificatesVOList)) {
+            dRyxxsjyVO.setCertificatesVOList(certificatesVOList);
+        }
+        // 其它附件-暂无
+        // 职务类型变更记录
+        List<ZwlxbgjlVO> zwlxbgjlVOList = dRyxxsjyMapper.getZwlxbgjlListById(dRyxxsjyVO.getSfzh());
+        if (!CollectionUtils.isEmpty(zwlxbgjlVOList)) {
+            dRyxxsjyVO.setZwlxbgjlVOVOList(zwlxbgjlVOList);
+        }
+        return dRyxxsjyVO;
+    }
+}

src/main/java/com/chinaitop/depot/common/util/PageParam.java

@@ -0,0 +1,23 @@
+package com.chinaitop.depot.common.util;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-11-01 10:46
+ */
+@Getter @Setter
+public class PageParam implements Serializable {
+    private static final long serialVersionUID = 7343245342308885003L;
+
+    @Min(message = "当前页必须>=1", value = 1)
+    private Integer pageNum;
+
+    @Min(message = "每页条数必须>=1", value = 1)
+    private Integer pageSize;
+}