Commit 3cc84e1f authored by hongguangwu's avatar hongguangwu

1.7.22-微信号

parent 784a39ed
...@@ -354,6 +354,11 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -354,6 +354,11 @@ public class TEmployeeContractPre extends BaseEntity {
@ExcelAttribute(name = "邮箱") @ExcelAttribute(name = "邮箱")
private String empEmail; private String empEmail;
// 1.7.22版本
@TableField(exist = false)
@ExcelProperty("微信号")
private String weChatId;
// 紧急联系人表 // 紧急联系人表
@TableField(exist = false) @TableField(exist = false)
@ExcelAttribute(name = "紧急联系人") @ExcelAttribute(name = "紧急联系人")
...@@ -366,6 +371,7 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -366,6 +371,7 @@ public class TEmployeeContractPre extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
@ExcelAttribute(name = "紧急联系人地址") @ExcelAttribute(name = "紧急联系人地址")
private String contactAddress; private String contactAddress;
// 电子签推送需要的新字段——END // 电子签推送需要的新字段——END
/** /**
* 是否拒绝入职: 0 是 1 否 * 是否拒绝入职: 0 是 1 否
......
...@@ -735,6 +735,11 @@ public class TEmployeeContractPreNew extends BaseEntity { ...@@ -735,6 +735,11 @@ public class TEmployeeContractPreNew extends BaseEntity {
@ExcelAttribute(name = "邮箱") @ExcelAttribute(name = "邮箱")
private String empEmail; private String empEmail;
// 1.7.22版本(档案字段)
@TableField(exist = false)
@ExcelProperty("微信号")
private String weChatId;
// MVP1.7.22版本新字段: // MVP1.7.22版本新字段:
@ExcelAttribute(name = "发薪日", maxLength = 2) @ExcelAttribute(name = "发薪日", maxLength = 2)
@Length(max = 2, message = "发薪日不能超过2个字符") @Length(max = 2, message = "发薪日不能超过2个字符")
......
package com.yifu.cloud.plus.v1.yifu.archives.vo; package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import lombok.Data; import lombok.Data;
...@@ -35,5 +36,8 @@ public class TEmployeeContractPrePushFascVo { ...@@ -35,5 +36,8 @@ public class TEmployeeContractPrePushFascVo {
@ExcelAttribute(name = "手机号码") @ExcelAttribute(name = "手机号码")
private String empPhone; private String empPhone;
@ExcelProperty("微信号")
private String weChatId;
} }
...@@ -343,6 +343,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr ...@@ -343,6 +343,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
contract.setContactArea(empInfo.getContactArea()); contract.setContactArea(empInfo.getContactArea());
contract.setEmpEmail(empInfo.getEmpEmail()); contract.setEmpEmail(empInfo.getEmpEmail());
contract.setEmpPhone(empInfo.getEmpPhone()); contract.setEmpPhone(empInfo.getEmpPhone());
contract.setWeChatId(empInfo.getWeChatId());
} }
if (Common.isEmpty(contract.getFadadaTemplateId())) { if (Common.isEmpty(contract.getFadadaTemplateId())) {
...@@ -407,6 +408,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr ...@@ -407,6 +408,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
contract.setContactArea(empInfo.getContactArea()); contract.setContactArea(empInfo.getContactArea());
contract.setEmpEmail(empInfo.getEmpEmail()); contract.setEmpEmail(empInfo.getEmpEmail());
contract.setEmpPhone(empInfo.getEmpPhone()); contract.setEmpPhone(empInfo.getEmpPhone());
contract.setWeChatId(empInfo.getWeChatId());
} }
if (Common.isEmpty(contract.getFadadaTemplateId())) { if (Common.isEmpty(contract.getFadadaTemplateId())) {
......
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
,ifnull(st2.AREA_NAME,'') ,ifnull(st2.AREA_NAME,'')
,ifnull(a.CONTACT_ADDRESS,'') ,ifnull(a.CONTACT_ADDRESS,'')
) contactArea,a.EMP_EMAIL empEmail, ) contactArea,a.EMP_EMAIL empEmail,
a.EMP_PHONE empPhone a.EMP_PHONE empPhone,a.WE_CHAT_ID weChatId
from t_employee_info a from t_employee_info a
left join sys_area sp on sp.id = a.ID_PROVINCE left join sys_area sp on sp.id = a.ID_PROVINCE
left join sys_area sc on sc.id = a.ID_CITY left join sys_area sc on sc.id = a.ID_CITY
......
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