Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into hr_728

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

@@ -72,6 +72,9 @@ public class EmployeeInfo {
 	@ApiModelProperty(value = "入职日期", required = false)
 	private java.util.Date entryDate;
 
+	@ApiModelProperty(value = "入职日期", required = false)
+	private String entryDateStr;
+
 	@ApiModelProperty(value = "分部", required = false)
 	private Integer organId;
 	
@@ -95,6 +98,9 @@ public class EmployeeInfo {
 	@ApiModelProperty(value = "离职日期", required = false)
 	private java.util.Date resignationDate;
 
+	@ApiModelProperty(value = "离职日期", required = false)
+	private String resignationDateStr;
+
 	@ApiModelProperty(value = "离职原因", required = false)
 	private String resignationReason;
 
@@ -113,16 +119,53 @@ public class EmployeeInfo {
 	private JobNatureEnum jobNature;
 	
 	private String hrbp;
+
+	private String hrbpName;
 	
 	/** 下次回访时间 */
 	private java.util.Date nextVisitDate;
 
+	/** 下次回访时间 */
+	private String nextVisitDateStr;
+
 	/**  */
 	private java.util.Date createTime;
 
 	/**  */
 	private java.util.Date updateTime;
 
+	public String getHrbpName() {
+		return hrbpName;
+	}
+
+	public void setHrbpName(String hrbpName) {
+		this.hrbpName = hrbpName;
+	}
+
+	public String getEntryDateStr() {
+		return entryDateStr;
+	}
+
+	public void setEntryDateStr(String entryDateStr) {
+		this.entryDateStr = entryDateStr;
+	}
+
+	public String getResignationDateStr() {
+		return resignationDateStr;
+	}
+
+	public void setResignationDateStr(String resignationDateStr) {
+		this.resignationDateStr = resignationDateStr;
+	}
+
+	public String getNextVisitDateStr() {
+		return nextVisitDateStr;
+	}
+
+	public void setNextVisitDateStr(String nextVisitDateStr) {
+		this.nextVisitDateStr = nextVisitDateStr;
+	}
+
 	public void setId(Long id) {
 		this.id = id;
 	}

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

@@ -23,12 +23,14 @@
 		<result column="assessment_result_" property="assessmentResult" />
 		<result column="other_comment_" property="otherComment" />
 		<result column="entry_date_" property="entryDate" />
+		<result column="entry_date_" property="entryDateStr" />
 		<result column="position_" property="position" 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" />
 		<result column="resignation_date_" property="resignationDate" />
+		<result column="resignation_date_" property="resignationDateStr" />
 		<result column="resignation_reason_" property="resignationReason" />
 		<result column="organ_id_" property="organId" />
 		<result column="operator_id_" property="operatorId" />
@@ -36,12 +38,14 @@
 		<result column="job_type_" property="jobType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="job_nature_" property="jobNature" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="hrbp_" property="hrbp" />
+		<result column="hrbp_name_" property="hrbpName" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="organName" property="organName" />
 		<result column="subjectName" property="subjectName" />
 		<result column="operatorName" property="operatorName" />
 		<result column="next_visit_date_" property="nextVisitDate" />
+		<result column="next_visit_date_" property="nextVisitDateStr" />
 	</resultMap>
 	
 	<resultMap type="com.ym.mec.biz.dal.dto.EmployeeInfoDto" id="EmployeeInfoDto" extends="EmployeeInfo">
@@ -199,10 +203,11 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="EmployeeInfo" parameterType="map">
-		SELECT o.name_ organName,group_concat(s.name_) subjectName,u.real_name_ operatorName,ei.* FROM employee_info ei
+		SELECT o.name_ organName,group_concat(s.name_) subjectName,u.real_name_ operatorName,ei.*,u1.real_name_ hrbp_name_ FROM employee_info ei
 		left join subject s on find_in_set(s.id_,ei.subject_id_list_)
 		left join organization o on o.id_ = ei.organ_id_
 		left join sys_user u on u.id_ = ei.operator_id_
+		left join sys_user u1 on u1.id_ = ei.hrbp_
         <include refid="queryPageMap"/>
         GROUP BY ei.id_
 		ORDER BY ei.update_time_ desc

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -3073,12 +3073,12 @@ public class ExportController extends BaseController {
                     "声部", "所在城市", "工作意向", "信息来源","下次沟通时间","入职时间",
                     "职位", "分部", "人员状态", "证件号码","年龄","性别",
                     "银行卡", "开户行", "紧急联系人", "紧急联系人关系","紧急联系人电话","最后一次操作时间",
-                    "归属管理HR", "离职时间"
+                    "HRBP", "离职时间"
             };
             String[] body = {"id", "realName", "mobileNo", "wechatNo", "subjectName", "liveCity", "intentionCity",
-                    "sourceFrom", "nextVisitDate", "entryDate", "position.msg","organName","status.desc",
+                    "sourceFrom", "nextVisitDateStr", "entryDateStr", "position.msg","organName","status.desc",
                     "idCard", "age", "gender?'男':'女'", "bankCardNo","bankAddress","emergencyContactName",
-                    "emergencyContactRelation", "emergencyContactPhone", "updateTime", "operatorName","resignationDate"};
+                    "emergencyContactRelation", "emergencyContactPhone", "updateTime", "hrbpName","resignationDateStr"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=employeeInfo-" + DateUtil.getDate(new Date()) + ".xls");