zkr/shz-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改工作经历和教育经历实体类位置，方便移动端用户可以修改自己的信息

Browse Source 
2.修改es按照名称或者类型查询的逻辑
This commit is contained in:
chenshaohua
2026-07-14 13:00:57 +08:00
parent bf49838c22
commit b782793e25
17 changed files with 134 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUserEducation.java Normal file
View File

@@ -0,0 +1,72 @@
package com.ruoyi.common.core.domain.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("APP求职者教育经历表")
@TableName("app_user_education")
public class AppUserEducation extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键ID */
@TableId(type = IdType.AUTO)
private Long id;
/** 求职者用户ID */
@Excel(name = "用户ID")
@ApiModelProperty("用户ID")
private Long userId;
/** 学校名称 */
@Excel(name = "学校名称")
@ApiModelProperty("学校名称")
private String schoolName;
/** 学历 */
@Excel(name = "学历")
@ApiModelProperty("学历")
private Integer educationLevel;
/** 专业 */
@Excel(name = "专业")
@ApiModelProperty("专业")
private String major;
/** 学位 */
@Excel(name = "学位 1学士 2硕士 3博士")
@ApiModelProperty("学位")
private String degree;
/** 学习形式 1全日制 2自考 3函授 4成人 */
@Excel(name = "学习形式")
@ApiModelProperty("学习形式")
private String studyType;
/** 入学时间（字符串模糊填写） */
@Excel(name = "入学时间")
@ApiModelProperty("入学时间")
private String startTime;
/** 毕业时间 */
@Excel(name = "毕业时间")
@ApiModelProperty("毕业时间")
private String endTime;
/** 在校经历描述 在校经历、获奖、主修课程 */
@Excel(name = "在校经历")
@ApiModelProperty("在校经历")
private String content;
/** 排序 */
@Excel(name = "排序")
@ApiModelProperty("排序")
private Integer sort;
}

64
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUserTrain.java Normal file
View File

@@ -0,0 +1,64 @@
package com.ruoyi.common.core.domain.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("APP求职者培训经历表")
@TableName("app_user_train")
public class AppUserTrain extends BaseEntity
{
@TableField(exist = false)
private static final long serialVersionUID = 1L;
/** 主键ID */
@TableId(type = IdType.AUTO)
private Long id;
/** 求职者用户ID */
@Excel(name = "求职者用户ID")
@ApiModelProperty("求职者用户ID")
private Long userId;
/** 培训机构 */
@Excel(name = "培训机构")
@ApiModelProperty("培训机构")
private String trainOrg;
/** 培训课程 */
@Excel(name = "培训课程")
@ApiModelProperty("培训课程")
private String trainCourse;
/** 培训开始时间（字符串自由填写） */
@Excel(name = "开始时间")
@ApiModelProperty("开始时间")
private String startTime;
/** 培训结束时间 */
@Excel(name = "结束时间")
@ApiModelProperty("结束时间")
private String endTime;
/** 培训证书 */
@Excel(name = "培训证书")
@ApiModelProperty("培训证书")
private String trainCert;
/** 培训内容 */
@Excel(name = "培训内容")
@ApiModelProperty("培训内容")
private String trainContent;
/** 排序 */
@Excel(name = "排序")
@ApiModelProperty("排序")
private Integer sort;
}

6
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
View File

@@ -21,6 +21,12 @@ public class RegisterBody extends LoginBody
@ApiModelProperty("技能列表")
private List<AppSkill> appSkillsList;
@ApiModelProperty("教育经历列表")
private List<AppUserEducation> appUserEducations;
@ApiModelProperty("培训经历列表")
private List<AppUserTrain> appUserTrains;
@ApiModelProperty("公司信息")
private Company company;