Commit c7904064 authored by hongguangwu's avatar hongguangwu

1.7.22-微信号

parent 0d3c3944
...@@ -76,7 +76,7 @@ public class TMainExportAllVO { ...@@ -76,7 +76,7 @@ public class TMainExportAllVO {
@ExcelAttribute(needExport = true, name ="邮箱") @ExcelAttribute(needExport = true, name ="邮箱")
private String field17; private String field17;
@ExcelAttribute(needExport = true, name ="微信号") @ExcelAttribute(needExport = true, name ="微信号")
private String field71; private String field79;
@ExcelAttribute(needExport = true, name = "户籍所在地-省", isArea = true) @ExcelAttribute(needExport = true, name = "户籍所在地-省", isArea = true)
private String field18; private String field18;
@ExcelAttribute(needExport = true, name = "户籍所在地-市", isArea = true, parentField = "field18") @ExcelAttribute(needExport = true, name = "户籍所在地-市", isArea = true, parentField = "field18")
......
...@@ -82,7 +82,7 @@ public class TPreMainExportAllVO { ...@@ -82,7 +82,7 @@ public class TPreMainExportAllVO {
@ExcelAttribute(needExport = true, name = "邮箱") @ExcelAttribute(needExport = true, name = "邮箱")
private String field17; private String field17;
@ExcelAttribute(needExport = true, name = "微信号") @ExcelAttribute(needExport = true, name = "微信号")
private String field71; private String field79;
@ExcelAttribute(needExport = true, name = "户籍所在地-省", isArea = true) @ExcelAttribute(needExport = true, name = "户籍所在地-省", isArea = true)
private String field18; private String field18;
@ExcelAttribute(needExport = true, name = "户籍所在地-市", isArea = true, parentField = "field18") @ExcelAttribute(needExport = true, name = "户籍所在地-市", isArea = true, parentField = "field18")
......
...@@ -483,7 +483,7 @@ ...@@ -483,7 +483,7 @@
,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7 ,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7
,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30','长期','固定')) field8 ,e.VALIDITY_START field9 ,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30','长期','固定')) field8 ,e.VALIDITY_START field9
,if(e.VALIDITY_END > '2999-12-30','长期',e.VALIDITY_END) field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12,e.EMP_MARRI_STATUS field13,e.EMP_NATIONAL field14 ,if(e.VALIDITY_END > '2999-12-30','长期',e.VALIDITY_END) field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12,e.EMP_MARRI_STATUS field13,e.EMP_NATIONAL field14
,e.POLITICAL_STATUS field15,e.EMP_PHONE field16,e.EMP_EMAIL field17,e.WE_CHAT_ID field71 ,e.POLITICAL_STATUS field15,e.EMP_PHONE field16,e.EMP_EMAIL field17,e.WE_CHAT_ID field79
,e.ID_PROVINCE field18,e.ID_CITY field69,e.ID_TOWN field70,e.ID_PROVINCE field18,e.EMP_REGIS_TYPE field19 ,e.ID_PROVINCE field18,e.ID_CITY field69,e.ID_TOWN field70,e.ID_PROVINCE field18,e.EMP_REGIS_TYPE field19
,e.FILE_PROVINCE field20,e.FILE_CITY field71,e.FILE_TOWN field72,if(e.status=0,'草稿','已审核') field21 ,e.FILE_PROVINCE field20,e.FILE_CITY field71,e.FILE_TOWN field72,if(e.status=0,'草稿','已审核') field21
,e.CONTACT_ADDRESS field22,p.UNIT_NAME field23,p.DEPT_NAME field24,p.DEPT_NO field64 ,e.CONTACT_ADDRESS field22,p.UNIT_NAME field23,p.DEPT_NAME field24,p.DEPT_NO field64
......
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7 ,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7
,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30','长期','固定')) field8 ,e.VALIDITY_START field9 ,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30','长期','固定')) field8 ,e.VALIDITY_START field9
,if(e.VALIDITY_END > '2999-12-30','长期',e.VALIDITY_END) field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12 ,e.EMP_MARRI_STATUS field13,e.EMP_NATIONAL field14 ,if(e.VALIDITY_END > '2999-12-30','长期',e.VALIDITY_END) field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12 ,e.EMP_MARRI_STATUS field13,e.EMP_NATIONAL field14
,e.POLITICAL_STATUS field15,e.EMP_PHONE field16,e.EMP_EMAIL field17,e.WE_CHAT_ID field71 ,e.POLITICAL_STATUS field15,e.EMP_PHONE field16,e.EMP_EMAIL field17,e.WE_CHAT_ID field79
,e.ID_PROVINCE field18,e.ID_CITY field69,e.ID_TOWN field70,e.EMP_REGIS_TYPE field19 ,e.ID_PROVINCE field18,e.ID_CITY field69,e.ID_TOWN field70,e.EMP_REGIS_TYPE field19
,e.FILE_PROVINCE field20,e.FILE_CITY field71,e.FILE_TOWN field72,if(e.status=0,'草稿','已审核') field21, ,e.FILE_PROVINCE field20,e.FILE_CITY field71,e.FILE_TOWN field72,if(e.status=0,'草稿','已审核') field21,
e.CONTACT_PROVINCE as "field66", e.CONTACT_CITY as "field67", e.CONTACT_TOWN as "field68" e.CONTACT_PROVINCE as "field66", e.CONTACT_CITY as "field67", e.CONTACT_TOWN as "field68"
......
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