Commit f4ee4cf3 authored by wangzb's avatar wangzb

feature-wzb :添加通信地址同时同步档案

parent ad75c249
...@@ -161,4 +161,11 @@ public class EmpAddDispatchVo extends TEmployeeInfo { ...@@ -161,4 +161,11 @@ public class EmpAddDispatchVo extends TEmployeeInfo {
@Schema(description = "是否删除 0否/1是") @Schema(description = "是否删除 0否/1是")
private String deleteFlag; private String deleteFlag;
/**
* 通信地址
*/
@Schema(description = "通信地址")
private String contactAddress;
} }
...@@ -2368,6 +2368,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2368,6 +2368,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
employeeInfo = new TEmployeeInfo(); employeeInfo = new TEmployeeInfo();
BeanUtil.copyProperties(empAdd, employeeInfo); BeanUtil.copyProperties(empAdd, employeeInfo);
employeeInfo.setEmpCode(getCode()); employeeInfo.setEmpCode(getCode());
employeeInfo.setContactAddress(employeeInfo.getContactAddress());
employeeInfo.setIsCollege(CommonConstants.ONE_INT);
employeeInfo.setHignEducation(employeeInfo.getHignEducation());
employeeInfo.setStatus(CommonConstants.ZERO_INT); employeeInfo.setStatus(CommonConstants.ZERO_INT);
date = IdCardUtil.getBirthdate(employeeInfo.getEmpIdcard()); date = IdCardUtil.getBirthdate(employeeInfo.getEmpIdcard());
if (Common.isNotNull(date)) { if (Common.isNotNull(date)) {
......
...@@ -488,6 +488,16 @@ public class TDispatchImportVo extends RowIndex implements Serializable { ...@@ -488,6 +488,16 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
@ExcelProperty("派单ID" ) @ExcelProperty("派单ID" )
private String dispatchId; private String dispatchId;
/**
* 通信地址
*/
@Schema(description = "通信地址" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("通信地址" )
private String contactAddress;
/** /**
* 订单ID * 订单ID
*/ */
......
...@@ -2048,6 +2048,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2048,6 +2048,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
emp.setCreateBy(user.getId()); emp.setCreateBy(user.getId());
emp.setCreateName(user.getNickname()); emp.setCreateName(user.getNickname());
emp.setEmpIdcard(excel.getEmpIdcard()); emp.setEmpIdcard(excel.getEmpIdcard());
emp.setContactAddress(excel.getContactAddress());
emp.setEmpName(excel.getEmpName()); emp.setEmpName(excel.getEmpName());
emp.setEmpNational(excel.getEmpNational()); emp.setEmpNational(excel.getEmpNational());
emp.setEmpNatrue(excel.getEmpType()); emp.setEmpNatrue(excel.getEmpType());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment