update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/EmployeeInfo.java

@@ -4,8 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.ym.mec.biz.dal.enums.JobNatureEnum;
 import com.ym.mec.biz.dal.enums.JobTypeEnum;
+import com.ym.mec.biz.dal.enums.StaffStatusEnum;
 
 /**
  * 对应数据库表(employee_info):
@@ -55,10 +55,10 @@ public class EmployeeInfo {
 	private String educationalBackground;
 
 	@ApiModelProperty(value = "声部", required = false)
-	private Integer subjectId;
+	private Integer subjectIdList;
 
-	@ApiModelProperty(value = "是否评估", required = false)
-	private boolean isInterviewed;
+	@ApiModelProperty(value = "评估结果", required = false)
+	private boolean accessmentResult;
 
 	@ApiModelProperty(value = "其他综合情况", required = false)
 	private String otherComment;
@@ -72,8 +72,8 @@ public class EmployeeInfo {
 	@ApiModelProperty(value = "职位", required = false)
 	private JobTypeEnum position;
 
-	@ApiModelProperty(value = "工作性质（全职/兼职）", required = false)
-	private JobNatureEnum jobNature;
+	@ApiModelProperty(value = "人员状态", required = false)
+	private StaffStatusEnum status;
 
 	@ApiModelProperty(value = "是否是试用期", required = false)
 	private boolean isProbationPeriod;
@@ -211,20 +211,20 @@ public class EmployeeInfo {
 		return this.educationalBackground;
 	}
 
-	public void setSubjectId(Integer subjectId) {
-		this.subjectId = subjectId;
+	public Integer getSubjectIdList() {
+		return subjectIdList;
 	}
 
-	public Integer getSubjectId() {
-		return this.subjectId;
+	public void setSubjectIdList(Integer subjectIdList) {
+		this.subjectIdList = subjectIdList;
 	}
 
-	public void setIsInterviewed(boolean isInterviewed) {
-		this.isInterviewed = isInterviewed;
+	public boolean isAccessmentResult() {
+		return accessmentResult;
 	}
 
-	public boolean isIsInterviewed() {
-		return this.isInterviewed;
+	public void setAccessmentResult(boolean accessmentResult) {
+		this.accessmentResult = accessmentResult;
 	}
 
 	public void setOtherComment(String otherComment) {
@@ -243,14 +243,6 @@ public class EmployeeInfo {
 		return this.entryDate;
 	}
 
-	public boolean isInterviewed() {
-		return isInterviewed;
-	}
-
-	public void setInterviewed(boolean isInterviewed) {
-		this.isInterviewed = isInterviewed;
-	}
-
 	public Integer getOrganId() {
 		return organId;
 	}
@@ -275,12 +267,12 @@ public class EmployeeInfo {
 		return this.position;
 	}
 
-	public void setJobNature(JobNatureEnum jobNature) {
-		this.jobNature = jobNature;
+	public StaffStatusEnum getStatus() {
+		return status;
 	}
 
-	public JobNatureEnum getJobNature() {
-		return this.jobNature;
+	public void setStatus(StaffStatusEnum status) {
+		this.status = status;
 	}
 
 	public void setIsProbationPeriod(boolean isProbationPeriod) {

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/StaffStatusEnum.java

@@ -0,0 +1,24 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum StaffStatusEnum implements BaseEnum<String, StaffStatusEnum> {
+
+	NOT_EMPLOYED("未录用"), INTERVIEWING("面试中"), RESERVE("储备"), PART_TIME("兼职"), FULL_TIME("全职"), DIMISSION("离职");
+
+	private String desc;
+
+	StaffStatusEnum(String desc) {
+		this.desc = desc;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	@Override
+	public String getCode() {
+		return this.name();
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/EmployeeInfoQueryInfo.java

@@ -2,8 +2,8 @@ package com.ym.mec.biz.dal.page;
 
 import io.swagger.annotations.ApiModelProperty;
 
-import com.ym.mec.biz.dal.enums.JobNatureEnum;
 import com.ym.mec.biz.dal.enums.JobTypeEnum;
+import com.ym.mec.biz.dal.enums.StaffStatusEnum;
 import com.ym.mec.common.page.QueryInfo;
 
 public class EmployeeInfoQueryInfo extends QueryInfo {
@@ -23,8 +23,8 @@ public class EmployeeInfoQueryInfo extends QueryInfo {
 	@ApiModelProperty(value = "职位", required = false)
 	private JobTypeEnum position;
 
-	@ApiModelProperty(value = "工作性质（全职/兼职）", required = false)
-	private JobNatureEnum jobNature;
+	@ApiModelProperty(value = "状态", required = false)
+	private StaffStatusEnum status;
 
 	public String getUserNameOrIdOrMobile() {
 		return userNameOrIdOrMobile;
@@ -58,12 +58,12 @@ public class EmployeeInfoQueryInfo extends QueryInfo {
 		this.position = position;
 	}
 
-	public JobNatureEnum getJobNature() {
-		return jobNature;
+	public StaffStatusEnum getStatus() {
+		return status;
 	}
 
-	public void setJobNature(JobNatureEnum jobNature) {
-		this.jobNature = jobNature;
+	public void setStatus(StaffStatusEnum status) {
+		this.status = status;
 	}
 
 	public String getSourceFrom() {

mec-biz/src/main/resources/config/mybatis/EmployeeInfoMapper.xml

@@ -18,12 +18,12 @@
 		<result column="live_city_" property="liveCity" />
 		<result column="intention_city_" property="intentionCity" />
 		<result column="educational_background_" property="educationalBackground" />
-		<result column="subject_id_" property="subjectId" />
-		<result column="is_interviewed_" property="isInterviewed" />
+		<result column="subject_id_list_" property="subjectIdList" />
+		<result column="assessment_result_" property="accessmentResult" />
 		<result column="other_comment_" property="otherComment" />
 		<result column="entry_date_" property="entryDate" />
 		<result column="position_" property="position" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
-		<result column="job_nature_" property="jobNature" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="is_probation_period_" property="isProbationPeriod" />
 		<result column="bank_card_no_" property="bankCardNo" />
 		<result column="bank_address_" property="bankAddress" />
@@ -53,8 +53,8 @@
 		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO employee_info
-		(id_,real_name_,mobile_no_,wechat_no_,id_card_,age_,gender_,birthdate_,emergency_contact_name_,emergency_contact_relation_,emergency_contact_phone_,live_city_,intention_city_,educational_background_,subject_id_,is_interviewed_,other_comment_,entry_date_,organ_id_,position_,job_nature_,is_probation_period_,bank_card_no_,bank_address_,resignation_date_,operator_id_,source_from_,create_time_,update_time_)
-		VALUES(#{id},#{realName},#{mobileNo},#{wechatNo},#{idCard},#{age},#{gender},#{birthdate},#{emergencyContactName},#{emergencyContactRelation},#{emergencyContactPhone},#{liveCity},#{intentionCity},#{educationalBackground},#{subjectId},#{isInterviewed},#{otherComment},#{entryDate},#{organId},#{position,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{jobNature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isProbationPeriod},#{bankCardNo},#{bankAddress},#{resignationDate},#{operatorId},#{sourceFrom},#{createTime},#{updateTime})
+		(id_,real_name_,mobile_no_,wechat_no_,id_card_,age_,gender_,birthdate_,emergency_contact_name_,emergency_contact_relation_,emergency_contact_phone_,live_city_,intention_city_,educational_background_,subject_id_list_,assessment_result_,other_comment_,entry_date_,organ_id_,position_,status_,is_probation_period_,bank_card_no_,bank_address_,resignation_date_,operator_id_,source_from_,create_time_,update_time_)
+		VALUES(#{id},#{realName},#{mobileNo},#{wechatNo},#{idCard},#{age},#{gender},#{birthdate},#{emergencyContactName},#{emergencyContactRelation},#{emergencyContactPhone},#{liveCity},#{intentionCity},#{educationalBackground},#{subjectIdList},#{accessmentResult},#{otherComment},#{entryDate},#{organId},#{position,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isProbationPeriod},#{bankCardNo},#{bankAddress},#{resignationDate},#{operatorId},#{sourceFrom},#{createTime},#{updateTime})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -64,8 +64,8 @@
 			<if test="isProbationPeriod != null">
 				is_probation_period_ = #{isProbationPeriod},
 			</if>
-			<if test="subjectId != null">
-				subject_id_ = #{subjectId},
+			<if test="subjectIdList != null">
+				subject_id_list_ = #{subjectIdList},
 			</if>
 			<if test="gender != null">
 				gender_ = #{gender},
@@ -76,8 +76,8 @@
 			<if test="otherComment != null">
 				other_comment_ = #{otherComment},
 			</if>
-			<if test="jobNature != null">
-				job_nature_ = #{jobNature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+			<if test="status != null">
+				status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="educationalBackground != null">
 				educational_background_ = #{educationalBackground},
@@ -124,8 +124,8 @@
 			<if test="wechatNo != null">
 				wechat_no_ = #{wechatNo},
 			</if>
-			<if test="isInterviewed != null">
-				is_interviewed_ = #{isInterviewed},
+			<if test="accessmentResult != null">
+				assessment_result_ = #{accessmentResult},
 			</if>
 			<if test="mobileNo != null">
 				mobile_no_ = #{mobileNo},
@@ -166,7 +166,7 @@
 	            AND (real_name_ LIKE CONCAT('%',#{userNameOrIdOrMobile},'%') OR mobile_no_ LIKE CONCAT('%',#{userNameOrIdOrMobile},'%') OR id_ = #{userNameOrIdOrMobile})
 	        </if>
 	        <if test="subjectId != null">
-	            AND subject_id_ = #{subjectId}
+	            AND find_in_set(#{subjectId},subject_id_list_)
 	        </if>
 	        <if test="sourceFrom != null">
 	            AND source_from_ = #{sourceFrom}
@@ -174,8 +174,8 @@
 	        <if test="position != null">
 	            AND position_ = #{position,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 	        </if>
-	        <if test="jobNature != null">
-	            AND job_nature_ = #{jobNature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+	        <if test="status != null">
+	            AND status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 	        </if>
 		</where>
     </sql>