1.人事管理

src/main/java/cn/timer/api/bean/zpgl/ZpglRcxx.java

@@ -197,6 +197,13 @@ public class ZpglRcxx extends Model<ZpglRcxx> {
 	*/
 	*/
 	@ApiModelProperty(value = "爱好特长")
 	@ApiModelProperty(value = "爱好特长")
 	private String hobby;
 	private String hobby;
+
+	/**
+	 * 自我介绍
+	 */
+	@ApiModelProperty(value = "自我介绍")
+	private String contMyDesc;
+
 	/**
 	/**
 	* 受到奖励
 	* 受到奖励
 	*/
 	*/

src/main/java/cn/timer/api/controller/zpgl/sevice/ZpglServiceImpl.java

@@ -575,6 +575,8 @@ public class ZpglServiceImpl implements ZpglService {
         zpglRcxx.setCompany(reumeSdkResult.getWork_company());
         zpglRcxx.setCompany(reumeSdkResult.getWork_company());
 
 
         zpglRcxx.setZjzw(reumeSdkResult.getWork_position());
         zpglRcxx.setZjzw(reumeSdkResult.getWork_position());
+        zpglRcxx.setContMyDesc(reumeSdkResult.getCont_my_desc());
+        zpglRcxx.setHobby(reumeSdkResult.getCont_hobby());
         zpglRcxx.insert();
         zpglRcxx.insert();
         /** 基础信息结束 */
         /** 基础信息结束 */
         if (!StringUtils.isEmpty(zpglRcxx.getId())) {
         if (!StringUtils.isEmpty(zpglRcxx.getId())) {

src/main/java/cn/timer/api/dto/resumesdk/ReumeSdkResult.java

@@ -74,6 +74,8 @@ public class ReumeSdkResult implements Serializable {
     private Date resume_parse_time;
     private Date resume_parse_time;
     private String resume_name;
     private String resume_name;
     private String avatar_data;
     private String avatar_data;
+    private String cont_my_desc;
+    private String cont_hobby;
     private List<Education_objs> education_objs;
     private List<Education_objs> education_objs;
     private List<Job_exp_objs> job_exp_objs;
     private List<Job_exp_objs> job_exp_objs;
     private List<Proj_exp_objs> proj_exp_objs;
     private List<Proj_exp_objs> proj_exp_objs;

src/main/java/cn/timer/api/dto/yggl/AddygdaDto.java

@@ -45,15 +45,15 @@ public class AddygdaDto extends Page implements Serializable{
 	@ApiModelProperty(value="手机号",example="101")
 	@ApiModelProperty(value="手机号",example="101")
 	private String phone;
 	private String phone;
 	
 	
-	@NotNull(message = ValidationMsg.NOTNULL)
+	/*@NotNull(message = ValidationMsg.NOTNULL)*/
 	@ApiModelProperty(value="证件类型 0:身份证;1:港澳居民来往内地通行证;2:台湾居民来往大陆通行证;3:外国护照;4:其他",example="0")
 	@ApiModelProperty(value="证件类型 0:身份证;1:港澳居民来往内地通行证;2:台湾居民来往大陆通行证;3:外国护照;4:其他",example="0")
     private Integer zjType;
     private Integer zjType;
     
     
-	@NotBlank(message = ValidationMsg.NOTBLANK)
+	/*@NotBlank(message = ValidationMsg.NOTBLANK)*/
 	@ApiModelProperty(value="证件号码 ",example="证件号码")
 	@ApiModelProperty(value="证件号码 ",example="证件号码")
     private String zjNum;
     private String zjNum;
 	
 	
-	@NotNull(message = ValidationMsg.NOTNULL)
+	/*@NotNull(message = ValidationMsg.NOTNULL)*/
 	@ApiModelProperty(value="工作性质 0全职、1实习生、2兼职、3劳务派遣、4劳务、5派遣、6外包、7退休返聘",example="0")
 	@ApiModelProperty(value="工作性质 0全职、1实习生、2兼职、3劳务派遣、4劳务、5派遣、6外包、7退休返聘",example="0")
     private Integer jobType;
     private Integer jobType;
 	
 	
@@ -62,7 +62,7 @@ public class AddygdaDto extends Page implements Serializable{
 	@ApiModelProperty(value="入职日期 ",example="客户注册后的时间为入职时间")
 	@ApiModelProperty(value="入职日期 ",example="客户注册后的时间为入职时间")
     private Date rzTime;
     private Date rzTime;
 	
 	
-	@NotNull(message = ValidationMsg.NOTNULL)
+	/*@NotNull(message = ValidationMsg.NOTNULL)*/
 	@ApiModelProperty(value="试用期 0:无试用期;1:1个月;2:2个月;3:3个月;4:4个月;5:5个月;6:6个月（有试用期显示选项）",example="0")
 	@ApiModelProperty(value="试用期 0:无试用期;1:1个月;2:2个月;3:3个月;4:4个月;5:5个月;6:6个月（有试用期显示选项）",example="0")
     private Integer syq;
     private Integer syq;
 	
 	
@@ -78,6 +78,12 @@ public class AddygdaDto extends Page implements Serializable{
 	
 	
 	@ApiModelProperty(value="考勤组id",example="0")
 	@ApiModelProperty(value="考勤组id",example="0")
     private Integer attgroupid;
     private Integer attgroupid;
+
+	@ApiModelProperty(value="对应合同公司字典ID",example="0")
+    private Integer zpglCompanyId;
+
+	@ApiModelProperty(value="对应工作地点典ID",example="0")
+	private Integer zpglGzddId;
 	
 	
 	
 	
 }
 }

src/main/java/cn/timer/api/dto/yggl/EmpQuery.java

@@ -35,6 +35,9 @@ public class EmpQuery extends Page implements Serializable{
 	
 	
 	@ApiModelProperty(value = "员工id列表", example = "")
 	@ApiModelProperty(value = "员工id列表", example = "")
 	private List<Integer> empNums;
 	private List<Integer> empNums;
+
+	@ApiModelProperty(value="类型筛选：1在职 2全职 3试用期 4正式 5待离职 6已离职",example="1")
+	private Integer status;
 	
 	
 	
 	
 }
 }

src/main/resources/mapping/zpgl/ZpglRcxxMapper.xml

@@ -37,6 +37,7 @@
         <result property="workStatus" column="work_status"/>
         <result property="workStatus" column="work_status"/>
         <result property="workTimer" column="work_timer"/>
         <result property="workTimer" column="work_timer"/>
         <result property="hobby" column="hobby"/>
         <result property="hobby" column="hobby"/>
+        <result property="contMyDesc" column="cont_my_desc"/>
         <result property="reward" column="reward"/>
         <result property="reward" column="reward"/>
         <result property="record" column="record"/>
         <result property="record" column="record"/>
         <result property="zpglZpqdId" column="zpgl_zpqd_id"/>
         <result property="zpglZpqdId" column="zpgl_zpqd_id"/>