Commit 66b875b5 authored by hongguangwu's avatar hongguangwu

1.7.24 - 花名册加手机号码,合同止等字段

parent 88e4cffd
...@@ -70,6 +70,8 @@ public class SociaFriendYgsAddVo implements Serializable { ...@@ -70,6 +70,8 @@ public class SociaFriendYgsAddVo implements Serializable {
// "合同到期时间" 劳动合同截止日期 yyyy-MM-dd // "合同到期时间" 劳动合同截止日期 yyyy-MM-dd
@ExcelProperty("合同到期时间") @ExcelProperty("合同到期时间")
private String contractEnd; private String contractEnd;
@ExcelProperty("合同到期月")
private String contractEndMonth;
// 中断原因 除死亡以外,其他停保原因默认:“在职人员解除/终止劳动合同” 死亡对应“死亡或失踪” // 中断原因 除死亡以外,其他停保原因默认:“在职人员解除/终止劳动合同” 死亡对应“死亡或失踪”
@ExcelProperty("中断原因") @ExcelProperty("中断原因")
private String tbyy; private String tbyy;
...@@ -245,4 +247,10 @@ public class SociaFriendYgsAddVo implements Serializable { ...@@ -245,4 +247,10 @@ public class SociaFriendYgsAddVo implements Serializable {
// 医保的参保模式,默认的空的是续签,也可能会换成新签——医保增员时,税友反馈“未查询到人员基本信息” // 医保的参保模式,默认的空的是续签,也可能会换成新签——医保增员时,税友反馈“未查询到人员基本信息”
private String ysdCbms; private String ysdCbms;
@ExcelProperty("岗位" )
private String post;
// 起(顺延、养老、医疗)-止(合同),格式:YYYYMM-YYYYMM
@ExcelProperty("养老起-合同止" )
private String socialStartContractEndMonth;
} }
...@@ -115,6 +115,8 @@ ...@@ -115,6 +115,8 @@
,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush ,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush
,LAST_DAY(a.AUDIT_TIME) auditLastDay ,LAST_DAY(a.AUDIT_TIME) auditLastDay
,s.YSD_CBMS ysdCbms ,s.YSD_CBMS ysdCbms
,DATE_FORMAT(a.CONTRACT_END,'%Y-%m') contractEndMonth
,a.post
</sql> </sql>
...@@ -138,6 +140,8 @@ ...@@ -138,6 +140,8 @@
<include refid="getSocialSoldierBaseOne"/> <include refid="getSocialSoldierBaseOne"/>
,if(YGS_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YGS_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"), if(s.PENSION_START is not null,DATE_FORMAT(s.PENSION_START,"%Y-%m-%d"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d"))) socialStartDate ,if(YGS_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YGS_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"), if(s.PENSION_START is not null,DATE_FORMAT(s.PENSION_START,"%Y-%m-%d"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d"))) socialStartDate
,if(YGS_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YGS_SOCIAL_START_DATE_NEXT,"%Y%m"), if(s.PENSION_START is not null,DATE_FORMAT(s.PENSION_START,"%Y%m"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m"))) socialStartMonth ,if(YGS_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YGS_SOCIAL_START_DATE_NEXT,"%Y%m"), if(s.PENSION_START is not null,DATE_FORMAT(s.PENSION_START,"%Y%m"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m"))) socialStartMonth
,concat(if(YGS_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YGS_SOCIAL_START_DATE_NEXT,"%Y%m"), if(s.PENSION_START is not null,DATE_FORMAT(s.PENSION_START,"%Y%m"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m"))),'-',
if(a.contract_type = '1',DATE_FORMAT(a.CONTRACT_END,"%Y%m"),'')) socialStartContractEndMonth
,if(DATE_FORMAT(if(YGS_SOCIAL_START_DATE_NEXT is not null,YGS_SOCIAL_START_DATE_NEXT,if(s.PENSION_START is not null,s.PENSION_START,s.SOCIAL_START_DATE)),'%Y-%m')>DATE_FORMAT(s.AUDIT_TIME,"%Y-%m") ,if(DATE_FORMAT(if(YGS_SOCIAL_START_DATE_NEXT is not null,YGS_SOCIAL_START_DATE_NEXT,if(s.PENSION_START is not null,s.PENSION_START,s.SOCIAL_START_DATE)),'%Y-%m')>DATE_FORMAT(s.AUDIT_TIME,"%Y-%m")
,'' ,''
...@@ -238,6 +242,9 @@ ...@@ -238,6 +242,9 @@
,if(YSD_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"), if(s.MEDICAL_START is not null,DATE_FORMAT(s.MEDICAL_START,"%Y-%m-%d"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d"))) socialStartDate ,if(YSD_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"), if(s.MEDICAL_START is not null,DATE_FORMAT(s.MEDICAL_START,"%Y-%m-%d"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d"))) socialStartDate
,if(YSD_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YSD_SOCIAL_START_DATE_NEXT,"%Y%m"), if(s.MEDICAL_START is not null,DATE_FORMAT(s.MEDICAL_START,"%Y%m"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m"))) socialStartMonth ,if(YSD_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YSD_SOCIAL_START_DATE_NEXT,"%Y%m"), if(s.MEDICAL_START is not null,DATE_FORMAT(s.MEDICAL_START,"%Y%m"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m"))) socialStartMonth
,concat(if(YSD_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YSD_SOCIAL_START_DATE_NEXT,"%Y%m"), if(s.MEDICAL_START is not null,DATE_FORMAT(s.MEDICAL_START,"%Y%m"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m"))),'-',
if(a.contract_type = '1',DATE_FORMAT(a.CONTRACT_END,"%Y%m"),'')) socialStartContractEndMonth
,if(s.UNIT_MEDICAL_MONEY != 0 or s.PERSONAL_MEDICAL_MONEY != 0,1,0) unitMedicalMoney ,if(s.UNIT_MEDICAL_MONEY != 0 or s.PERSONAL_MEDICAL_MONEY != 0,1,0) unitMedicalMoney
,if(s.UNIT_BIRTH_MONEY != 0,1,0) unitBirthMoney ,if(s.UNIT_BIRTH_MONEY != 0,1,0) unitBirthMoney
,if(s.UNIT_BIGAILMENT_MONEY != 0 or s.PERSONAL_BIGAILMENT_MONEY != 0,1,0) unitBigailmentMoney ,if(s.UNIT_BIGAILMENT_MONEY != 0 or s.PERSONAL_BIGAILMENT_MONEY != 0,1,0) unitBigailmentMoney
...@@ -363,6 +370,8 @@ ...@@ -363,6 +370,8 @@
,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush ,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush
,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush ,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush
,LAST_DAY(a.AUDIT_TIME) auditLastDay ,LAST_DAY(a.AUDIT_TIME) auditLastDay
,DATE_FORMAT(a.CONTRACT_END,'%Y-%m') contractEndMonth
,a.post
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
<if test="idsStr != null and idsStr.size > 0"> <if test="idsStr != null and idsStr.size > 0">
/*派单推的,有ID,则查单个推送的,立即推*/ /*派单推的,有ID,则查单个推送的,立即推*/
......
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