yonge 5 年之前
父節點
當前提交
c1ff7d431f

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

@@ -58,7 +58,7 @@ public class EmployeeInfo {
 	private String subjectIdList;
 
 	@ApiModelProperty(value = "评估结果", required = false)
-	private String accessmentResult;
+	private String assessmentResult;
 
 	@ApiModelProperty(value = "其他综合情况", required = false)
 	private String otherComment;
@@ -219,12 +219,12 @@ public class EmployeeInfo {
 		this.subjectIdList = subjectIdList;
 	}
 
-	public String isAccessmentResult() {
-		return accessmentResult;
+	public String getAssessmentResult() {
+		return assessmentResult;
 	}
 
-	public void setAccessmentResult(String accessmentResult) {
-		this.accessmentResult = accessmentResult;
+	public void setAssessmentResult(String assessmentResult) {
+		this.assessmentResult = assessmentResult;
 	}
 
 	public void setOtherComment(String otherComment) {

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

@@ -19,7 +19,7 @@
 		<result column="intention_city_" property="intentionCity" />
 		<result column="educational_background_" property="educationalBackground" />
 		<result column="subject_id_list_" property="subjectIdList" />
-		<result column="assessment_result_" property="accessmentResult" />
+		<result column="assessment_result_" property="assessmentResult" />
 		<result column="other_comment_" property="otherComment" />
 		<result column="entry_date_" property="entryDate" />
 		<result column="position_" property="position" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
@@ -54,7 +54,7 @@
 			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_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})
+		VALUES(#{id},#{realName},#{mobileNo},#{wechatNo},#{idCard},#{age},#{gender},#{birthdate},#{emergencyContactName},#{emergencyContactRelation},#{emergencyContactPhone},#{liveCity},#{intentionCity},#{educationalBackground},#{subjectIdList},#{assessmentResult},#{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>
 
 	<!-- 根据主键查询一条记录 -->
@@ -124,8 +124,8 @@
 			<if test="wechatNo != null">
 				wechat_no_ = #{wechatNo},
 			</if>
-			<if test="accessmentResult != null">
-				assessment_result_ = #{accessmentResult},
+			<if test="assessmentResult != null">
+				assessment_result_ = #{assessmentResult},
 			</if>
 			<if test="mobileNo != null">
 				mobile_no_ = #{mobileNo},