新增修改

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonAscriptionDto.java

@@ -24,33 +24,22 @@ public class PersonAscriptionDto  extends BaseDto {
     @ApiModelProperty(value = "人员信息id")
     private Long personId;
 
-    @ApiModelProperty(value = "所在单位id")
-    private Long stationId;
-
     @ApiModelProperty(value = "进入本单位工作时间")
     private Date stationWorkTime;
 
     @ApiModelProperty(value = "所在项目id")
     private Long projectId;
-
+    @ApiModelProperty(value = "部门id")
     private Long departmentId;
 
     @ApiModelProperty(value = "工作所在地key")
     private String workPlaceKey;
 
-    @ApiModelProperty(value = "数据创建时间")
-    private Date createDate;
-
     @ApiModelProperty(value = "岗位")
     private String postName;
 
-    @ApiModelProperty(value = "岗位key")
-    private String postNameKey;
 
-    @ApiModelProperty(value = "组织机构id")
-    private String orgCode;
 
-    @ApiModelProperty(value = "部门名称")
-    private String departmentName;
+
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonBasicDto.java

@@ -52,9 +52,6 @@ public class PersonBasicDto  extends BaseDto {
     @ApiModelProperty(value = "政治面貌")
     private String politicCountenance;
 
-    @ApiModelProperty(value = "用工来源所在地")
-    private String employPlace;
-
     @ApiModelProperty(value = "户籍地址")
     private String registeredResidenceAddress;
 
@@ -63,6 +60,7 @@ public class PersonBasicDto  extends BaseDto {
 
     @ApiModelProperty(value = "应急电话")
     private String emergencyPhone;
+
     @ApiModelProperty(value = "电话")
     private String phone;
 
@@ -75,27 +73,9 @@ public class PersonBasicDto  extends BaseDto {
     @ApiModelProperty(value = "参加工作时间")
     private Date workTime;
 
-    @ApiModelProperty(value = "数据创建时间")
-    private Date createDate;
-
-    @ApiModelProperty(value = "平台user_id")
-    private Long userId;
-
-    @ApiModelProperty(value = "平台账号名称")
-    private String accountName;
-
-    @ApiModelProperty(value = "用户角色")
-    private String roles;
-
-    @ApiModelProperty(value = "角色名称")
-    private String roleName;
-
     @ApiModelProperty(value = "组织机构id")
     private String orgCode;
 
-    @ApiModelProperty(value = "角色key")
-    private String roleKey;
-
     @ApiModelProperty(value = "人员头像")
     private String headPhoto;
 

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonDto.java

@@ -2,23 +2,25 @@
 
 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
+import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonAccount;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonCertificate;
+import lombok.Data;
+
 /**
  * @description:
  * @author: tw
  * @createDate: 2023/4/20
  */
+@Data
 public class PersonDto {
     //人员基本信息
-   private PersonBasicDto personBasicDto;
-    //归属信息
-    private PersonAscriptionDto personAscriptionDto;
-    //技能学历
-    private PersonSkillEducationDto personSkillEducationDto;
+    private PersonUser personUser;
+
     //资质信息
-    private PersonCertificateDto personCertificateDto;
+    private PersonCertificate personCertificate;
 
     //账户信息
-    private PersonAccountDto personAccountDto;
+    private PersonAccount personAccount;
 
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonSkillEducationDto.java

@@ -35,8 +35,6 @@ public class PersonSkillEducationDto  extends BaseDto {
     @ApiModelProperty(value = "工种名称")
     private String workName;
 
-    @ApiModelProperty(value = "专业技术资格key")
-    private String professionalTechnologyKey;
 
     @ApiModelProperty(value = "专业技术资格名称")
     private String professionalTechnologyName;
@@ -65,7 +63,6 @@ public class PersonSkillEducationDto  extends BaseDto {
     @ApiModelProperty(value = "现学历所学专业")
     private String currentMajor;
 
-    @ApiModelProperty(value = "数据创建时间")
-    private Date createDate;
+
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonUser.java

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/4/21
+ */
+@Data
+public class PersonUser {
+
+   /**
+    * 基本信息
+    * */
+   @ApiModelProperty(value = "姓名")
+   private String name;
+
+    @ApiModelProperty(value = "性别( 0-男 1-女 )")
+    private Integer sex;
+
+    @ApiModelProperty(value = "工号")
+    private String jobNumber;
+
+    @ApiModelProperty(value = "证件类型(0-身份证)")
+    private Integer idType;
+
+    @ApiModelProperty(value = "证件编号")
+    private String idNumber;
+
+    @ApiModelProperty(value = "生日")
+    private Date birthday;
+
+    @ApiModelProperty(value = "年龄")
+    private Integer age;
+
+    @ApiModelProperty(value = "籍贯")
+    private String nativePlace;
+
+    @ApiModelProperty(value = "民族")
+    private String folkKey;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String politicCountenance;
+
+    @ApiModelProperty(value = "户籍地址")
+    private String registeredResidenceAddress;
+
+    @ApiModelProperty(value = "现住址")
+    private String presentAddress;
+
+    @ApiModelProperty(value = "应急电话")
+    private String emergencyPhone;
+
+    @ApiModelProperty(value = "电话")
+    private String phone;
+
+    @ApiModelProperty(value = "身高（厘米）")
+    private Integer height;
+
+    @ApiModelProperty(value = "体重（千克）")
+    private Integer weight;
+
+    @ApiModelProperty(value = "参加工作时间")
+    private Date workTime;
+
+    @ApiModelProperty(value = "组织机构id")
+    private String orgCode;
+
+    @ApiModelProperty(value = "人员头像")
+    private String headPhoto;
+
+    @ApiModelProperty(value = "证件照片正面")
+    private String frontCertificatePhoto;
+
+    @ApiModelProperty(value = "证件照片反面")
+    private String backCertificatePhoto;
+    /**
+     *归属信息
+     *
+     * */
+
+    @ApiModelProperty(value = "进入本单位工作时间")
+    private Date stationWorkTime;
+
+    @ApiModelProperty(value = "所在项目id")
+    private Long projectId;
+    @ApiModelProperty(value = "部门id")
+    private Long departmentId;
+
+    @ApiModelProperty(value = "工作所在地key")
+    private String workPlaceKey;
+
+    @ApiModelProperty(value = "岗位")
+    private String postName;
+
+
+    /**
+     * 技能学历
+     * */
+
+    @ApiModelProperty(value = "是否特殊工种")
+    private Integer isSpecialWork;
+
+    @ApiModelProperty(value = "技能鉴定工种key")
+    private String workTypeKey;
+
+    @ApiModelProperty(value = "工种名称")
+    private String workName;
+
+
+    @ApiModelProperty(value = "专业技术资格名称")
+    private String professionalTechnologyName;
+
+    @ApiModelProperty(value = "技能等级key")
+    private String skillLevelKey;
+
+    @ApiModelProperty(value = "专业技术资格等级")
+    private String professionalTechnologyLevelKey;
+
+    @ApiModelProperty(value = "岗位执业鉴定证书")
+    private String professionalQualificationCertificate;
+
+    @ApiModelProperty(value = " 岗位职业鉴定证书")
+    private String professionalCareerCertificate;
+
+    @ApiModelProperty(value = "初始学历key")
+    private String initialEducationKey;
+
+    @ApiModelProperty(value = "现学历key")
+    private String currentEducationKey;
+
+    @ApiModelProperty(value = "现学历学校名称")
+    private String currentSchool;
+
+    @ApiModelProperty(value = "现学历所学专业")
+    private String currentMajor;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonAscription.java

@@ -28,11 +28,6 @@ public class PersonAscription extends BaseEntity {
 	@TableField("person_id")
     private Long personId;
 
-    /**
-     * 所在单位id
-     */
-	@TableField("station_id")
-    private Long stationId;
 
     /**
      * 进入本单位工作时间
@@ -58,11 +53,6 @@ public class PersonAscription extends BaseEntity {
 	@TableField("work_place_key")
     private String workPlaceKey;
 
-    /**
-     * 数据创建时间
-     */
-	@TableField("create_date")
-    private Date createDate;
 
     /**
      * 岗位
@@ -70,22 +60,7 @@ public class PersonAscription extends BaseEntity {
 	@TableField("post_name")
     private String postName;
 
-    /**
-     * 岗位key
-     */
-	@TableField("post_name_key")
-    private String postNameKey;
 
-    /**
-     * 组织机构id
-     */
-	@TableField("org_code")
-    private String orgCode;
 
-    /**
-     * 部门名称
-     */
-	@TableField("department_name")
-    private String departmentName;
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonBasic.java

@@ -83,11 +83,7 @@ public class PersonBasic extends BaseEntity {
 	@TableField("politic_countenance")
     private String politicCountenance;
 
-    /**
-     * 用工来源所在地
-     */
-	@TableField("employ_place")
-    private String employPlace;
+
 
     /**
      * 户籍地址
@@ -126,47 +122,8 @@ public class PersonBasic extends BaseEntity {
 	@TableField("work_time")
     private Date workTime;
 
-    /**
-     * 数据创建时间
-     */
-	@TableField("create_date")
-    private Date createDate;
 
-    /**
-     * 平台user_id
-     */
-	@TableField("user_id")
-    private Long userId;
 
-    /**
-     * 平台账号名称
-     */
-	@TableField("account_name")
-    private String accountName;
-
-    /**
-     * 用户角色
-     */
-	@TableField("roles")
-    private String roles;
-
-    /**
-     * 角色名称
-     */
-	@TableField("role_name")
-    private String roleName;
-
-    /**
-     * 组织机构id
-     */
-	@TableField("org_code")
-    private String orgCode;
-
-    /**
-     * 角色key
-     */
-	@TableField("role_key")
-    private String roleKey;
 
     /**
      * 人员头像
@@ -186,4 +143,11 @@ public class PersonBasic extends BaseEntity {
 	@TableField("back_certificate_photo")
     private String backCertificatePhoto;
 
+    /**
+     * 组织机构id
+     */
+    @TableField("org_code")
+    private String orgCode;
+
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonSkillEducation.java

@@ -51,10 +51,11 @@ public class PersonSkillEducation extends BaseEntity {
     private String workTypeKey;
 
     /**
-     * 专业技术资格key
+     * 技能等级key
      */
-	@TableField("professional_technology_key")
-    private String professionalTechnologyKey;
+    @TableField("skill_level_key")
+    private String skillLevelKey;
+
 
     /**
      * 专业技术资格名称
@@ -62,11 +63,7 @@ public class PersonSkillEducation extends BaseEntity {
 	@TableField("professional_technology_name")
     private String professionalTechnologyName;
 
-    /**
-     * 技能等级key
-     */
-	@TableField("skill_level_key")
-    private String skillLevelKey;
+
 
     /**
      * 专业技术资格等级
@@ -74,17 +71,7 @@ public class PersonSkillEducation extends BaseEntity {
 	@TableField("professional_technology_level_key")
     private String professionalTechnologyLevelKey;
 
-    /**
-     * 岗位执业鉴定证书
-     */
-	@TableField("professional_qualification_certificate")
-    private String professionalQualificationCertificate;
 
-    /**
-     * 岗位职业鉴定证书
-     */
-    @TableField("professional_career_certificate")
-    private String professionalCareerCertificate;
 
     /**
      * 初始学历key
@@ -110,10 +97,18 @@ public class PersonSkillEducation extends BaseEntity {
 	@TableField("current_major")
     private String currentMajor;
 
+
+
     /**
-     * 数据创建时间
+     * 岗位执业鉴定证书
      */
-	@TableField("create_date")
-    private Date createDate;
+    @TableField("professional_qualification_certificate")
+    private String professionalQualificationCertificate;
+
+    /**
+     * 岗位职业鉴定证书
+     */
+    @TableField("professional_career_certificate")
+    private String professionalCareerCertificate;
 
 }