update

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

@@ -65,7 +65,7 @@ public class EmployeeInfo {
 
 	@ApiModelProperty(value = "入职日期", required = false)
 	private java.util.Date entryDate;
-	
+
 	@ApiModelProperty(value = "分部", required = false)
 	private Integer organId;
 
@@ -87,6 +87,12 @@ public class EmployeeInfo {
 	@ApiModelProperty(value = "离职日期", required = false)
 	private java.util.Date resignationDate;
 
+	@ApiModelProperty(value = "操作人编号", required = false)
+	private Integer operatorId;
+
+	@ApiModelProperty(value = "信息来源", required = false)
+	private String sourceFrom;
+
 	/**  */
 	private java.util.Date createTime;
 
@@ -325,6 +331,22 @@ public class EmployeeInfo {
 		return this.updateTime;
 	}
 
+	public Integer getOperatorId() {
+		return operatorId;
+	}
+
+	public void setOperatorId(Integer operatorId) {
+		this.operatorId = operatorId;
+	}
+
+	public String getSourceFrom() {
+		return sourceFrom;
+	}
+
+	public void setSourceFrom(String sourceFrom) {
+		this.sourceFrom = sourceFrom;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -10,6 +10,9 @@ public class EmployeeInfoQueryInfo extends QueryInfo {
 
 	@ApiModelProperty(value = "姓名/编号/手机号", required = false)
 	private String userNameOrIdOrMobile;
+	
+	@ApiModelProperty(value = "信息来源", required = false)
+	private String sourceFrom;
 
 	@ApiModelProperty(value = "分部", required = false)
 	private Integer organId;
@@ -62,4 +65,12 @@ public class EmployeeInfoQueryInfo extends QueryInfo {
 	public void setJobNature(JobNatureEnum jobNature) {
 		this.jobNature = jobNature;
 	}
+
+	public String getSourceFrom() {
+		return sourceFrom;
+	}
+
+	public void setSourceFrom(String sourceFrom) {
+		this.sourceFrom = sourceFrom;
+	}
 }

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

@@ -29,6 +29,8 @@
 		<result column="bank_address_" property="bankAddress" />
 		<result column="resignation_date_" property="resignationDate" />
 		<result column="organ_id_" property="organId" />
+		<result column="operator_id_" property="operatorId" />
+		<result column="source_from_" property="sourceFrom" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -51,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_,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},#{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_,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})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -140,6 +142,12 @@
 			<if test="organId != null">
 				organ_id_ = #{organId},
 			</if>
+			<if test="operatorId != null">
+				operator_id_ = #{operatorId},
+			</if>
+			<if test="sourceFrom != null">
+				source_from_ = #{sourceFrom},
+			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>
@@ -160,6 +168,9 @@
 	        <if test="subjectId != null">
 	            AND subject_id_ = #{subjectId}
 	        </if>
+	        <if test="sourceFrom != null">
+	            AND source_from_ = #{sourceFrom}
+	        </if>
 	        <if test="position != null">
 	            AND position_ = #{position,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 	        </if>