Commit 5597a052 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21

parents d4d6ce21 b034bbcb
...@@ -595,21 +595,111 @@ public class SysBaseSetInfo extends BaseEntity { ...@@ -595,21 +595,111 @@ public class SysBaseSetInfo extends BaseEntity {
private String insuranceBigailment; private String insuranceBigailment;
/** /**
* 补缴险种-补缴是否采用最新基数0是1 * 补缴险种 - 补缴是否采用最新基数 0 是 1
*/ */
@ExcelAttribute(name = "补缴险种-补缴是否采用最新基数0是1否") @ExcelAttribute(name = "补缴险种 - 补缴是否采用最新基数 0 是 1 否")
@Schema(description = "补缴险种-补缴是否采用最新基数0是1否") @Schema(description = "补缴险种 - 补缴是否采用最新基数 0 是 1 否")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴险种-补缴是否采用最新基数0是1否") @ExcelProperty("补缴险种 - 补缴是否采用最新基数 0 是 1 否")
private String insuranceIsLatestCardinality; private String insuranceIsLatestCardinality;
/** /**
* 删除标志0正常1删除 * 养工失补缴险种:养老、工伤、失业 - 是否可补缴 0:是,1:否
*/ */
@ExcelAttribute(name = "删除标志0正常1删除") @ExcelAttribute(name = "养工失补缴险种 - 是否可补缴 0:是,1:否")
@Schema(description = "删除标志0正常1删除") @Schema(description = "养工失补缴险种 - 是否可补缴 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("删除标志0正常1删除") @ExcelProperty("养工失补缴险种 - 是否可补缴 0:是,1:否")
private String canOverpayPension;
/**
* 养工失补缴险种:养老、工伤、失业 - 是否含起缴当月 0:是,1:否
*/
@ExcelAttribute(name = "养工失补缴险种 - 是否含起缴当月 0:是,1:否")
@Schema(description = "养工失补缴险种 - 是否含起缴当月 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养工失补缴险种 - 是否含起缴当月 0:是,1:否")
private String haveThisMonthPension;
/**
* 养工失补缴险种:养老、工伤、失业 - 最大补缴期限
*/
@ExcelAttribute(name = "养工失补缴险种 - 最大补缴期限")
@Schema(description = "养工失补缴险种 - 最大补缴期限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养工失补缴险种 - 最大补缴期限")
private Integer overpayNumberPension;
/**
* 养工失补缴险种:养老、工伤、失业 - 补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
*/
@ExcelAttribute(name = "养工失补缴险种 - 补缴基数类型 0:最新基数,1:当期基数,2:自定义基数")
@Schema(description = "养工失补缴险种 - 补缴基数类型 0:最新基数,1:当期基数,2:自定义基数")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养工失补缴险种 - 补缴基数类型 0:最新基数,1:当期基数,2:自定义基数")
private String baseTypePension;
/**
* 养工失补缴险种:养老、工伤、失业 - 补缴政策
*/
@ExcelAttribute(name = "养工失补缴险种 - 补缴政策")
@Schema(description = "养工失补缴险种 - 补缴政策")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养工失补缴险种 - 补缴政策")
private String payPolicyPension;
/**
* 医生大补缴险种:医疗、生育、大病 - 是否可补缴 0:是,1:否
*/
@ExcelAttribute(name = "医生大补缴险种 - 是否可补缴 0:是,1:否")
@Schema(description = "医生大补缴险种 - 是否可补缴 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医生大补缴险种 - 是否可补缴 0:是,1:否")
private String canOverpayMedical;
/**
* 医生大补缴险种:医疗、生育、大病 - 是否含起缴当月 0:是,1:否
*/
@ExcelAttribute(name = "医生大补缴险种 - 是否含起缴当月 0:是,1:否")
@Schema(description = "医生大补缴险种 - 是否含起缴当月 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医生大补缴险种 - 是否含起缴当月 0:是,1:否")
private String haveThisMonthMedical;
/**
* 医生大补缴险种:医疗、生育、大病 - 最大补缴期限
*/
@ExcelAttribute(name = "医生大补缴险种 - 最大补缴期限")
@Schema(description = "医生大补缴险种 - 最大补缴期限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医生大补缴险种 - 最大补缴期限")
private Integer overpayNumberMedical;
/**
* 医生大补缴险种:医疗、生育、大病 - 补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
*/
@ExcelAttribute(name = "医生大补缴险种 - 补缴基数类型 0:最新基数,1:当期基数,2:自定义基数")
@Schema(description = "医生大补缴险种 - 补缴基数类型 0:最新基数,1:当期基数,2:自定义基数")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医生大补缴险种 - 补缴基数类型 0:最新基数,1:当期基数,2:自定义基数")
private String baseTypeMedical;
/**
* 医生大补缴险种:医疗、生育、大病 - 补缴政策
*/
@ExcelAttribute(name = "医生大补缴险种 - 补缴政策")
@Schema(description = "医生大补缴险种 - 补缴政策")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医生大补缴险种 - 补缴政策")
private String payPolicyMedical;
/**
* 删除标志 0 正常 1 删除
*/
@ExcelAttribute(name = "删除标志 0 正常 1 删除")
@Schema(description = "删除标志 0 正常 1 删除")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("删除标志 0 正常 1 删除")
private String deleteFlag; private String deleteFlag;
/** /**
......
...@@ -544,6 +544,97 @@ public class TSocialFundInfo extends BaseEntity { ...@@ -544,6 +544,97 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty("社保停缴日期" ) @ExcelProperty("社保停缴日期" )
@TableField(updateStrategy = FieldStrategy.IGNORED) @TableField(updateStrategy = FieldStrategy.IGNORED)
private Date socialReduceDate; private Date socialReduceDate;
//----------------派单社保及医保补缴信息添加开始--------------------//
/**
* 社保是否可以补缴: 0:是,1:否
*/
@ExcelAttribute(name = "社保是否可以补缴: 0:是,1:否")
@Schema(description = "社保是否可以补缴: 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保是否可以补缴")
private String canOverpayPension;
/**
* 医保是否可以补缴: 0:是,1:否
*/
@ExcelAttribute(name = "医保是否可以补缴: 0:是,1:否")
@Schema(description = "医保是否可以补缴: 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保是否可以补缴: 0:是,1:否")
private String canOverpayMedical;
/**
* 社保补缴政策
*/
@Length(max = 500, message = "社保补缴政策 不能超过500个字符" )
@ExcelAttribute(name = "社保补缴政策", maxLength = 500)
@Schema(description = "社保补缴政策" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保补缴政策" )
private String payPolicyPension;
/**
* 社保补缴期限
*/
@ExcelAttribute(name = "社保补缴期限" )
@Schema(description = "社保补缴期限" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保补缴期限" )
private Integer overpayNumberPension;
/**
* 社保是否含当月 0:是,1:否
*/
@Length(max = 1, message = "社保是否含当月 0:是,1:否 不能超过1个字符" )
@ExcelAttribute(name = "社保是否含当月 0:是,1:否", maxLength = 1)
@Schema(description = "社保是否含当月 0:是,1:否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保是否含当月 0:是,1:否" )
private String haveThisMonthPension;
/**
* 医保补缴政策
*/
@Length(max = 500, message = "医保补缴政策 不能超过500个字符" )
@ExcelAttribute(name = "医保补缴政策", maxLength = 500)
@Schema(description = "医保补缴政策" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保补缴政策" )
private String payPolicyMedical;
/**
* 医保补缴期限
*/
@ExcelAttribute(name = "医保补缴期限" )
@Schema(description = "医保补缴期限" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保补缴期限" )
private Integer overpayNumberMedical;
/**
* 医保是否含当月 0:是,1:否
*/
@Length(max = 1, message = "医保是否含当月 0:是,1:否 不能超过1个字符" )
@ExcelAttribute(name = "医保是否含当月 0:是,1:否", maxLength = 1)
@Schema(description = "医保是否含当月 0:是,1:否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保是否含当月 0:是,1:否" )
private String haveThisMonthMedical;
/**
* 社保补缴险种:医疗、生育、大病 - 补缴基数类型 0:最新基数,1:当期基数
*/
@ExcelAttribute(name = "社保补缴基数类型 0:最新基数,1:当期基数")
@Schema(description = "社保补缴基数类型 0:最新基数,1:当期基数")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保补缴基数类型 0:最新基数,1:当期基数")
private String baseTypePension;
/**
* 医保补缴险种:医疗、生育、大病 - 补缴基数类型 0:最新基数,1:当期基数
*/
@ExcelAttribute(name = "医保补缴基数类型 0:最新基数,1:当期基数")
@Schema(description = "医保补缴基数类型 0:最新基数,1:当期基数")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保补缴基数类型 0:最新基数,1:当期基数")
private String baseTypeMedical;
//----------------派单社保及医保补缴信息添加结束--------------------//
/** /**
* 是否可补缴 0:是,1:否 * 是否可补缴 0:是,1:否
*/ */
...@@ -553,6 +644,7 @@ public class TSocialFundInfo extends BaseEntity { ...@@ -553,6 +644,7 @@ public class TSocialFundInfo extends BaseEntity {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否可补缴 0:是,1:否" ) @ExcelProperty("是否可补缴 0:是,1:否" )
private String canOverpay; private String canOverpay;
/** /**
* 补缴政策(社保或公积金) * 补缴政策(社保或公积金)
*/ */
......
...@@ -605,6 +605,78 @@ public class TSocialInfo extends BaseEntity { ...@@ -605,6 +605,78 @@ public class TSocialInfo extends BaseEntity {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否含当月 0:是,1:否" ) @ExcelProperty("是否含当月 0:是,1:否" )
private String haveThisMonth; private String haveThisMonth;
//----------------派单社保及医保补缴信息添加开始--------------------//
/**
* 社保是否可以补缴: 0:是,1:否
*/
@ExcelAttribute(name = "社保是否可以补缴: 0:是,1:否")
@Schema(description = "社保是否可以补缴: 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保是否可以补缴")
private String canOverpayPension;
/**
* 医保是否可以补缴: 0:是,1:否
*/
@ExcelAttribute(name = "医保是否可以补缴: 0:是,1:否")
@Schema(description = "医保是否可以补缴: 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保是否可以补缴: 0:是,1:否")
private String canOverpayMedical;
/**
* 社保补缴期限
*/
@ExcelAttribute(name = "社保补缴期限" )
@Schema(description = "社保补缴期限" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保补缴期限" )
private Integer overpayNumberPension;
/**
* 社保是否含当月 0:是,1:否
*/
@Length(max = 1, message = "社保是否含当月 0:是,1:否 不能超过1个字符" )
@ExcelAttribute(name = "社保是否含当月 0:是,1:否", maxLength = 1)
@Schema(description = "社保是否含当月 0:是,1:否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保是否含当月 0:是,1:否" )
private String haveThisMonthPension;
/**
* 医保补缴期限
*/
@ExcelAttribute(name = "医保补缴期限" )
@Schema(description = "医保补缴期限" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保补缴期限" )
private Integer overpayNumberMedical;
/**
* 医保是否含当月 0:是,1:否
*/
@Length(max = 1, message = "医保是否含当月 0:是,1:否 不能超过1个字符" )
@ExcelAttribute(name = "医保是否含当月 0:是,1:否", maxLength = 1)
@Schema(description = "医保是否含当月 0:是,1:否" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保是否含当月 0:是,1:否" )
private String haveThisMonthMedical;
/**
* 社保补缴险种:医疗、生育、大病 - 补缴基数类型 0:最新基数,1:当期基数
*/
@ExcelAttribute(name = "社保补缴基数类型 0:最新基数,1:当期基数")
@Schema(description = "社保补缴基数类型 0:最新基数,1:当期基数")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保补缴基数类型 0:最新基数,1:当期基数")
private String baseTypePension;
/**
* 医保补缴险种:医疗、生育、大病 - 补缴基数类型 0:最新基数,1:当期基数
*/
@ExcelAttribute(name = "医保补缴基数类型 0:最新基数,1:当期基数")
@Schema(description = "医保补缴基数类型 0:最新基数,1:当期基数")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保补缴基数类型 0:最新基数,1:当期基数")
private String baseTypeMedical;
//----------------派单社保及医保补缴信息添加结束--------------------//
/** /**
* 是否能补缴养老0是1否 * 是否能补缴养老0是1否
*/ */
......
...@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; ...@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion; import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jdk.nashorn.internal.ir.annotations.Ignore;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -339,11 +340,11 @@ public class SysBaseSetSocialExportVo implements Serializable { ...@@ -339,11 +340,11 @@ public class SysBaseSetSocialExportVo implements Serializable {
/** /**
* 是否可以补缴: 0:是,1:否 * 是否可以补缴: 0:是,1:否
*/ */
@ExcelAttribute(name = "是否可以补缴",readConverterExp = "0=是,1=否") /*@ExcelAttribute(name = "是否可以补缴",readConverterExp = "0=是,1=否")
@Schema(description = "是否可以补缴: 0:是,1:否") @Schema(description = "是否可以补缴: 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否可以补缴") @ExcelProperty("是否可以补缴")
private String canOverpay; private String canOverpay;*/
/** /**
...@@ -364,49 +365,97 @@ public class SysBaseSetSocialExportVo implements Serializable { ...@@ -364,49 +365,97 @@ public class SysBaseSetSocialExportVo implements Serializable {
@ExcelProperty("个人比例合计") @ExcelProperty("个人比例合计")
private BigDecimal personalProSum; private BigDecimal personalProSum;
// ==================== 社保:养老、工伤、失业 ====================
/** /**
* 补缴险种-整合字段 * 社保是否可补缴 0:是,1:否
*/ */
@ExcelAttribute(name = "补缴险种") @ExcelAttribute(name = "社保是否可补缴", readConverterExp = "0=是,1=否")
@Schema(description = "补缴险种") @Schema(description = "社保是否可补缴 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴险种") @ExcelProperty("社保是否可补缴")
private String insurancePension; private String canOverpayPension;
/** /**
* 最大补缴期限 * 社保最大补缴期限
*/ */
@ExcelAttribute(name = "最大补缴期限", readConverterExp = "1=一个月,2=二个月,3=三个月,4=四个月,5=五个月,6=六个月,7=七个月,8=八个月,9=九个月,10=十个月,11=十一个月,12=十二个月") @ExcelAttribute(name = "社保最大补缴期限", readConverterExp = "1=一个月,2=二个月,3=三个月,4=四个月,5=五个月,6=六个月,7=七个月,8=八个月,9=九个月,10=十个月,11=十一个月,12=十二个月")
@Schema(description = "最大补缴期限") @Schema(description = "社保最大补缴期限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("最大补缴期限") @ExcelProperty("社保最大补缴期限")
private String overpayNumber; private String overpayNumberPension;
/** /**
* 是否含起缴当月: 0:是,1: * 社保是否含起缴当月 0:是,1:
*/ */
@ExcelAttribute(name = "是否含起缴当月",readConverterExp = "0=是,1=否") @ExcelAttribute(name = "社保是否含起缴当月", readConverterExp = "0=是,1=否")
@Schema(description = "是否含起缴当月: 0:是,1:否") @Schema(description = "社保是否含起缴当月 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否含起缴当月") @ExcelProperty("社保是否含起缴当月")
private String haveThisMonth; private String haveThisMonthPension;
/** /**
* 补缴险种-补缴是否采用最新基数0是1否 * 社保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
*/ */
@ExcelAttribute(name = "补缴基数", readConverterExp = "0=最新基数,1=当期基数") @ExcelAttribute(name = "社保补缴基数", readConverterExp = "0=最新基数,1=当期基数,2=自定义基数")
@Schema(description = "补缴基数") @Schema(description = "社保补缴基数 0:最新基数,1:当期基数,2:自定义基数")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴基数") @ExcelProperty("社保补缴基数")
private String insuranceIsLatestCardinality; private String baseTypePension;
/** /**
* 补缴政策(社保或公积金) * 社保补缴政策
*/ */
@ExcelAttribute(name = "补缴政策") @ExcelAttribute(name = "社保补缴政策")
@Schema(description = "补缴政策") @Schema(description = "社保补缴政策")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴政策") @ExcelProperty("社保补缴政策")
private String payPolicy; private String payPolicyPension;
// ==================== 医保:医疗、生育、大病 ====================
/**
* 医保是否可补缴 0:是,1:否
*/
@ExcelAttribute(name = "医保是否可补缴", readConverterExp = "0=是,1=否")
@Schema(description = "医保是否可补缴 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保是否可补缴")
private String canOverpayMedical;
/**
* 医保最大补缴期限
*/
@ExcelAttribute(name = "医保最大补缴期限", readConverterExp = "1=一个月,2=二个月,3=三个月,4=四个月,5=五个月,6=六个月,7=七个月,8=八个月,9=九个月,10=十个月,11=十一个月,12=十二个月")
@Schema(description = "医保最大补缴期限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保最大补缴期限")
private String overpayNumberMedical;
/**
* 医保是否含起缴当月 0:是,1:否
*/
@ExcelAttribute(name = "医保是否含起缴当月", readConverterExp = "0=是,1=否")
@Schema(description = "医保是否含起缴当月 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保是否含起缴当月")
private String haveThisMonthMedical;
/**
* 医保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
*/
@ExcelAttribute(name = "医保补缴基数", readConverterExp = "0=最新基数,1=当期基数,2=自定义基数")
@Schema(description = "医保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保补缴基数")
private String baseTypeMedical;
/**
* 医保补缴政策
*/
@ExcelAttribute(name = "医保补缴政策")
@Schema(description = "医保补缴政策")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保补缴政策")
private String payPolicyMedical;
} }
...@@ -7,7 +7,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants; ...@@ -7,7 +7,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex; import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Length;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -328,57 +327,109 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable { ...@@ -328,57 +327,109 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
@ExcelProperty("个人大病比例") @ExcelProperty("个人大病比例")
private BigDecimal payPersonalPro; private BigDecimal payPersonalPro;
// ==================== 社保类补缴险种:养老、工伤、失业 ====================
/** /**
* 是否可补缴: 0:是,1: * 社保是否可补缴 0:是,1:
*/ */
@ExcelAttribute(name = "是否可补缴", readConverterExp = "0=是,1=否") @ExcelAttribute(name = "社保是否可补缴",isNotEmpty = true, readConverterExp = "0=是,1=否")
@Schema(description = "是否可补缴: 0:是,1:否") @Schema(description = "社保是否可补缴 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否可补缴") @ExcelProperty("社保是否可补缴")
private String canOverpay; private String canOverpayPension;
/** /**
* 补缴险种 0是1否 养老、医疗、失业、工伤、生育、大病 * 【社保整合字段--养老、工伤、失业】
*/ */
@ExcelAttribute(name = "补缴险种") @ExcelAttribute(name = "社保类补缴险种")
@Schema(description = "补缴险种") @Schema(description = "社保类补缴险种")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴险种") @ExcelProperty("社保类补缴险种")
private String insurancePension; private String insurancePension;
/**
* 社保是否含起缴当月 0:是,1:否
*/
@ExcelAttribute(name = "社保是否含起缴当月", readConverterExp = "0=是,1=否")
@Schema(description = "社保是否含起缴当月 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保是否含起缴当月")
private String haveThisMonthPension;
/**
* 社保最大补缴期限
*/
@ExcelAttribute(name = "社保最大补缴期限", readConverterExp = "1=一个月,2=二个月,3=三个月,4=四个月,5=五个月,6=六个月,7=七个月,8=八个月,9=九个月,10=十个月,11=十一个月,12=十二个月")
@Schema(description = "社保最大补缴期限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保最大补缴期限")
private String overpayNumberPension;
/**
* 社保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
*/
@ExcelAttribute(name = "社保补缴基数", readConverterExp = "0=最新基数,1=当期基数,2=自定义基数")
@Schema(description = "社保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保补缴基数")
private String baseTypePension;
/**
* 社保补缴政策
*/
@ExcelAttribute(name = "社保补缴政策")
@Schema(description = "社保补缴政策")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保补缴政策")
private String payPolicyPension;
// ==================== 医保类补缴险种:医疗、生育、大病 ====================
/**
* 医保是否可补缴 0:是,1:否
*/
@ExcelAttribute(name = "医保是否可补缴",isNotEmpty = true, readConverterExp = "0=是,1=否")
@Schema(description = "医保是否可补缴 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保是否可补缴")
private String canOverpayMedical;
/**
* 医保整合字段-医疗、生育、大病
*/
@ExcelAttribute(name = "医保类补缴险种")
@Schema(description = "医保类补缴险种")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保类补缴险种")
private String insurancePensionMedical;
/** /**
* 最大补缴期限 1:一月、2:二月 ...... 12:十二月 * 医保是否含起缴当月 0:是,1:否
*/ */
@ExcelAttribute(name = "最大补缴期限",isDataId = true,dataType = ExcelAttributeConstants.SOCIAL_OVERPAY_MOTH, readConverterExp = "1=一个月,2=二个月,3=三个月,4=四个月,5=五个月,6=六个月,7=七个月,8=八个月,9=九个月,10=十个月,11=十一个月,12=十二个月") @ExcelAttribute(name = "医保是否含起缴当月", readConverterExp = "0=是,1=否")
@Schema(description = "最大补缴期限") @Schema(description = "医保是否含起缴当月 0:是,1:否")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("最大补缴期限") @ExcelProperty("医保是否含起缴当月")
private String overpayNumber; private String haveThisMonthMedical;
/** /**
* 是否含起缴当月: 0:是,1:否 * 医保最大补缴期限
*/ */
@ExcelAttribute(name = "是否含起缴当月", readConverterExp = "0=是,1=否") @ExcelAttribute(name = "医保最大补缴期限", readConverterExp = "1=一个月,2=二个月,3=三个月,4=四个月,5=五个月,6=六个月,7=七个月,8=八个月,9=九个月,10=十个月,11=十一个月,12=十二个月")
@Schema(description = "是否含起缴当月: 0:是,1:否") @Schema(description = "医保最大补缴期限")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否含起缴当月") @ExcelProperty("医保最大补缴期限")
private String haveThisMonth; private String overpayNumberMedical;
/** /**
* 补缴基数:0最新基数1当期基数 * 医保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
*/ */
@ExcelAttribute(name = "补缴基数", readConverterExp = "0=最新基数,1=当期基数") @ExcelAttribute(name = "医保补缴基数", readConverterExp = "0=最新基数,1=当期基数,2=自定义基数")
@Schema(description = "补缴基数") @Schema(description = "医保补缴基数 0:最新基数,1:当期基数,2:自定义基数")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴基数") @ExcelProperty("医保补缴基数")
private String insuranceIsLatestCardinality; private String baseTypeMedical;
/** /**
* 补缴政策 * 医保补缴政策
*/ */
@ExcelAttribute(name = "补缴政策") @ExcelAttribute(name = "医保补缴政策")
@Schema(description = "补缴政策") @Schema(description = "医保补缴政策")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("补缴政策") @ExcelProperty("医保补缴政策")
private String payPolicy; private String payPolicyMedical;
} }
...@@ -1058,6 +1058,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1058,6 +1058,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialFund.setCanOverpay(social.getCanOverpay()); socialFund.setCanOverpay(social.getCanOverpay());
socialFund.setOverpayNumber(social.getOverpayNumber()); socialFund.setOverpayNumber(social.getOverpayNumber());
socialFund.setHaveThisMonth(social.getHaveThisMonth()); socialFund.setHaveThisMonth(social.getHaveThisMonth());
socialFund.setCanOverpayPension(social.getCanOverpayPension());
socialFund.setOverpayNumberPension(social.getOverpayNumberPension());
socialFund.setHaveThisMonthPension(social.getHaveThisMonthPension());
socialFund.setBaseTypePension(social.getBaseTypePension());
socialFund.setCanOverpayMedical(social.getCanOverpayMedical());
socialFund.setOverpayNumberMedical(social.getOverpayNumberMedical());
socialFund.setHaveThisMonthMedical(social.getHaveThisMonthMedical());
socialFund.setBaseTypeMedical(social.getBaseTypeMedical());
socialFund.setInsuranceBigailment(social.getInsuranceBigailment()); socialFund.setInsuranceBigailment(social.getInsuranceBigailment());
socialFund.setInsuranceBirth(social.getInsuranceBirth()); socialFund.setInsuranceBirth(social.getInsuranceBirth());
socialFund.setInsuranceInjury(social.getInsuranceInjury()); socialFund.setInsuranceInjury(social.getInsuranceInjury());
...@@ -1236,6 +1247,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1236,6 +1247,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialFund.setLowerLimit(socialSet.getLowerLimit()); socialFund.setLowerLimit(socialSet.getLowerLimit());
socialFund.setUpperLimit(socialSet.getUpperLimit()); socialFund.setUpperLimit(socialSet.getUpperLimit());
socialFund.setPayPolicy(socialSet.getPayPolicy()); socialFund.setPayPolicy(socialSet.getPayPolicy());
socialFund.setPayPolicyPension(socialSet.getPayPolicyPension());
socialFund.setPayPolicyMedical(socialSet.getPayPolicyMedical());
socialFund.setLatestCardinality(socialSet.getInsuranceIsLatestCardinality()); socialFund.setLatestCardinality(socialSet.getInsuranceIsLatestCardinality());
//配置没有大病清理社保公积金查询里面残留的历史大病信息 //配置没有大病清理社保公积金查询里面残留的历史大病信息
if (CommonConstants.ONE_STRING.equals(socialSet.getIsIllness()) if (CommonConstants.ONE_STRING.equals(socialSet.getIsIllness())
...@@ -1801,20 +1814,28 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1801,20 +1814,28 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setSocialTown(Integer.toString(socialSet.getTown())); social.setSocialTown(Integer.toString(socialSet.getTown()));
} }
social.setCanOverpay(socialSet.getCanOverpay()); social.setCanOverpay(socialSet.getCanOverpay());
social.setCanOverpayPension(socialSet.getCanOverpayPension());
social.setCanOverpayMedical(socialSet.getCanOverpayMedical());
social.setCardinalId(socialSet.getId()); social.setCardinalId(socialSet.getId());
social.setSocialHousehold(socialSet.getDepartId()); social.setSocialHousehold(socialSet.getDepartId());
social.setSocialHouseholdName(socialSet.getDepartName()); social.setSocialHouseholdName(socialSet.getDepartName());
social.setCollectMoth(socialSet.getCollectMoth()); social.setCollectMoth(socialSet.getCollectMoth());
social.setCollectType(socialSet.getCollectType()); social.setCollectType(socialSet.getCollectType());
social.setHaveThisMonth(socialSet.getHaveThisMonth()); social.setHaveThisMonth(socialSet.getHaveThisMonth());
social.setHaveThisMonthPension(socialSet.getHaveThisMonthPension());
social.setHaveThisMonthMedical(socialSet.getHaveThisMonthMedical());
social.setInsuranceBirth(socialSet.getInsuranceBirth()); social.setInsuranceBirth(socialSet.getInsuranceBirth());
social.setInsuranceInjury(socialSet.getInsuranceInjury()); social.setInsuranceInjury(socialSet.getInsuranceInjury());
social.setInsuranceMedical(socialSet.getInsuranceMedical()); social.setInsuranceMedical(socialSet.getInsuranceMedical());
social.setInsurancePension(socialSet.getInsurancePension()); social.setInsurancePension(socialSet.getInsurancePension());
social.setInsuranceUnemployment(socialSet.getInsuranceUnemployment()); social.setInsuranceUnemployment(socialSet.getInsuranceUnemployment());
social.setInsuranceIsLatestCardinality(socialSet.getInsuranceIsLatestCardinality()); social.setInsuranceIsLatestCardinality(socialSet.getInsuranceIsLatestCardinality());
social.setBaseTypePension(socialSet.getBaseTypePension());
social.setBaseTypeMedical(socialSet.getBaseTypeMedical());
social.setIsChargePersonal(socialSet.getIsChargePersonal()); social.setIsChargePersonal(socialSet.getIsChargePersonal());
social.setOverpayNumber(socialSet.getOverpayNumber()); social.setOverpayNumber(socialSet.getOverpayNumber());
social.setOverpayNumberPension(socialSet.getOverpayNumberPension());
social.setOverpayNumberMedical(socialSet.getOverpayNumberMedical());
social.setValueType(socialSet.getValueType()); social.setValueType(socialSet.getValueType());
social.setPayPolicy(socialSet.getPayPolicy()); social.setPayPolicy(socialSet.getPayPolicy());
social.setLowerLimit(socialSet.getLowerLimit()); social.setLowerLimit(socialSet.getLowerLimit());
...@@ -3009,37 +3030,37 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3009,37 +3030,37 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private boolean validSocialStartDate(List<ErrorMessage> errorMessageList, TDispatchImportVo excel, SysBaseSetInfo socialSet) { private boolean validSocialStartDate(List<ErrorMessage> errorMessageList, TDispatchImportVo excel, SysBaseSetInfo socialSet) {
if (Common.isNotNull(excel.getPensionStart()) if (Common.isNotNull(excel.getPensionStart())
&& ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getPensionStart()), && ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getPensionStart()),
socialSet.getCanOverpay(), socialSet.getOverpayNumber(), socialSet.getHaveThisMonth())) { socialSet.getCanOverpayPension(), socialSet.getOverpayNumberPension(), socialSet.getHaveThisMonthPension())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR)));
return true; return true;
} }
if (Common.isNotNull(excel.getMedicalStart()) if (Common.isNotNull(excel.getMedicalStart())
&& ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getMedicalStart()), && ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getMedicalStart()),
socialSet.getCanOverpay(), socialSet.getOverpayNumber(), socialSet.getHaveThisMonth())) { socialSet.getCanOverpayMedical(), socialSet.getOverpayNumberMedical(), socialSet.getHaveThisMonthMedical())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR)));
return true; return true;
} }
if (Common.isNotNull(excel.getUnemployStart()) if (Common.isNotNull(excel.getUnemployStart())
&& ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getUnemployStart()), && ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getUnemployStart()),
socialSet.getCanOverpay(), socialSet.getOverpayNumber(), socialSet.getHaveThisMonth())) { socialSet.getCanOverpayPension(), socialSet.getOverpayNumberPension(), socialSet.getHaveThisMonthPension())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR)));
return true; return true;
} }
if (Common.isNotNull(excel.getWorkInjuryStart()) if (Common.isNotNull(excel.getWorkInjuryStart())
&& ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getWorkInjuryStart()), && ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getWorkInjuryStart()),
socialSet.getCanOverpay(), socialSet.getOverpayNumber(), socialSet.getHaveThisMonth())) { socialSet.getCanOverpayPension(), socialSet.getOverpayNumberPension(), socialSet.getHaveThisMonthPension())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR)));
return true; return true;
} }
if (Common.isNotNull(excel.getBirthStart()) if (Common.isNotNull(excel.getBirthStart())
&& ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getBirthStart()), && ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getBirthStart()),
socialSet.getCanOverpay(), socialSet.getOverpayNumber(), socialSet.getHaveThisMonth())) { socialSet.getCanOverpayMedical(), socialSet.getOverpayNumberMedical(), socialSet.getHaveThisMonthMedical())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR)));
return true; return true;
} }
if (Common.isNotNull(excel.getBigailmentStart()) if (Common.isNotNull(excel.getBigailmentStart())
&& ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getBigailmentStart()), && ServiceUtil.checkDispatchDate(LocalDateTimeUtils.convertDateToLDT(excel.getBigailmentStart()),
socialSet.getCanOverpay(), socialSet.getOverpayNumber(), socialSet.getHaveThisMonth())) { socialSet.getCanOverpayMedical(), socialSet.getOverpayNumberMedical(), socialSet.getHaveThisMonthMedical())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_START_IS_ERROR)));
return true; return true;
} }
......
...@@ -567,6 +567,32 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -567,6 +567,32 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
} }
return overpayMonth; return overpayMonth;
} }
private Integer getOverpayMonthMedical(TSocialFundInfo tSocialInfo) {
Integer overpayMonth = null;
if (CommonConstants.ZERO_STRING.equals(tSocialInfo.getCanOverpayMedical())) {
//补缴是否含当月: 含当月
if (CommonConstants.ZERO_STRING.equals(tSocialInfo.getHaveThisMonthMedical())) {
overpayMonth = Integer.parseInt(DateUtil.getYearAndMonth(tSocialInfo.getCreateTime(), 0));
//补缴是否含当月: 不含含当月
} else {
overpayMonth = Integer.parseInt(DateUtil.getYearAndMonth(tSocialInfo.getCreateTime(), CommonConstants.ONE_INT_NEGATE));
}
}
return overpayMonth;
}
private Integer getOverpayMonthPension(TSocialFundInfo tSocialInfo) {
Integer overpayMonth = null;
if (CommonConstants.ZERO_STRING.equals(tSocialInfo.getCanOverpayPension())) {
//补缴是否含当月: 含当月
if (CommonConstants.ZERO_STRING.equals(tSocialInfo.getHaveThisMonthPension())) {
overpayMonth = Integer.parseInt(DateUtil.getYearAndMonth(tSocialInfo.getCreateTime(), 0));
//补缴是否含当月: 不含含当月
} else {
overpayMonth = Integer.parseInt(DateUtil.getYearAndMonth(tSocialInfo.getCreateTime(), CommonConstants.ONE_INT_NEGATE));
}
}
return overpayMonth;
}
private void initSocialLibary(String diffType, String payMonth, Map<String, TForecastLibrary> saveLibraryMap private void initSocialLibary(String diffType, String payMonth, Map<String, TForecastLibrary> saveLibraryMap
, TSocialFundInfo tSocialInfo, boolean isReduceFund, HashMap<String, TAgentConfig> agentConfigMap , TSocialFundInfo tSocialInfo, boolean isReduceFund, HashMap<String, TAgentConfig> agentConfigMap
...@@ -599,7 +625,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -599,7 +625,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
lib.setDeptNo(tSocialInfo.getSettleDomainCode()); lib.setDeptNo(tSocialInfo.getSettleDomainCode());
//判断是否允许补缴 是否可补缴 0:是 //判断是否允许补缴 是否可补缴 0:是
Integer monthT = this.getOverpayMonth(tSocialInfo); Integer monthPension = this.getOverpayMonthPension(tSocialInfo);
Integer monthMedcial = this.getOverpayMonthMedical(tSocialInfo);
//初始化社保派减状态 按派减时间派单对应缴纳月是否已派减社保 //初始化社保派减状态 按派减时间派单对应缴纳月是否已派减社保
boolean isReduceSocial; boolean isReduceSocial;
if (null != tSocialInfo.getSocialReduceDate()) { if (null != tSocialInfo.getSocialReduceDate()) {
...@@ -607,16 +634,16 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -607,16 +634,16 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
} else { } else {
isReduceSocial = false; isReduceSocial = false;
} }
lib = initForecastLibrary(lib, tSocialInfo, null, monthT, isReduceFund, isReduceSocial, agentConfigMap lib = initForecastLibrary(lib, tSocialInfo, null, monthPension, isReduceFund, isReduceSocial, agentConfigMap
, historyLibrary, isOnly); , historyLibrary, isOnly, monthMedcial);
saveLibraryMap.put(sfMapKey, lib); saveLibraryMap.put(sfMapKey, lib);
} }
// historyLibrary_历史比例(暂时未用到) // historyLibrary_历史比例(暂时未用到)
private TForecastLibrary initForecastLibrary(TForecastLibrary library private TForecastLibrary initForecastLibrary(TForecastLibrary library
, TSocialFundInfo socialInfo, TSocialFundInfo fund, Integer month, boolean isReduceFund , TSocialFundInfo socialInfo, TSocialFundInfo fund, Integer monthPension, boolean isReduceFund
, boolean isReduceSocial, HashMap<String, TAgentConfig> agentConfigMap , boolean isReduceSocial, HashMap<String, TAgentConfig> agentConfigMap
, TForecastLibrary historyLibrary, boolean isOnly) { , TForecastLibrary historyLibrary, boolean isOnly,Integer monthMedcial) {
if (null != socialInfo && !isReduceSocial) { if (null != socialInfo && !isReduceSocial) {
library.setSocialId(socialInfo.getId()); library.setSocialId(socialInfo.getId());
library.setUnitBitailmentFee(BigDecimal.ZERO); library.setUnitBitailmentFee(BigDecimal.ZERO);
...@@ -646,26 +673,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -646,26 +673,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
} }
// 补缴处理 不需要补缴的险种置为零 // 补缴处理 不需要补缴的险种置为零
if (null != month && Integer.parseInt(library.getSocialPayMonth()) <= month) { if (null != monthPension && Integer.parseInt(library.getSocialPayMonth()) <= monthPension) {
// 是否补缴大病:0是 1否
if (CommonConstants.ONE_STRING.equals(socialInfo.getInsuranceBigailment())) {
library.setUnitBitailmentFee(BigDecimal.ZERO);
library.setPersonalBigailmentFee(BigDecimal.ZERO);
}
// 是否补缴养老:0是1 否 // 是否补缴养老:0是1 否
if (CommonConstants.ONE_STRING.equals(socialInfo.getInsurancePension())) { if (CommonConstants.ONE_STRING.equals(socialInfo.getInsurancePension())) {
library.setUnitPensionFee(BigDecimal.ZERO); library.setUnitPensionFee(BigDecimal.ZERO);
library.setPersonalPensionFee(BigDecimal.ZERO); library.setPersonalPensionFee(BigDecimal.ZERO);
} }
// 是否补缴医疗:0是1否
if (CommonConstants.ONE_STRING.equals(socialInfo.getInsuranceMedical())) {
library.setUnitMedicalFee(BigDecimal.ZERO);
library.setPersonalMedicalFee(BigDecimal.ZERO);
}
// 是否补缴生育
if (CommonConstants.ONE_STRING.equals(socialInfo.getInsuranceBirth())) {
library.setUnitBirthFee(BigDecimal.ZERO);
}
// 是否补缴工伤 // 是否补缴工伤
if (CommonConstants.ONE_STRING.equals(socialInfo.getInsuranceInjury())) { if (CommonConstants.ONE_STRING.equals(socialInfo.getInsuranceInjury())) {
library.setUnitWorkInjuryFee(BigDecimal.ZERO); library.setUnitWorkInjuryFee(BigDecimal.ZERO);
...@@ -676,6 +689,23 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -676,6 +689,23 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
library.setPersonalUnemploymentFee(BigDecimal.ZERO); library.setPersonalUnemploymentFee(BigDecimal.ZERO);
} }
} }
if (null != monthMedcial && Integer.parseInt(library.getSocialPayMonth()) <= monthMedcial) {
// 是否补缴大病:0是 1否
if (CommonConstants.ONE_STRING.equals(socialInfo.getInsuranceBigailment())) {
library.setUnitBitailmentFee(BigDecimal.ZERO);
library.setPersonalBigailmentFee(BigDecimal.ZERO);
}
// 是否补缴医疗:0是1否
if (CommonConstants.ONE_STRING.equals(socialInfo.getInsuranceMedical())) {
library.setUnitMedicalFee(BigDecimal.ZERO);
library.setPersonalMedicalFee(BigDecimal.ZERO);
}
// 是否补缴生育
if (CommonConstants.ONE_STRING.equals(socialInfo.getInsuranceBirth())) {
library.setUnitBirthFee(BigDecimal.ZERO);
}
}
library.setPersonalSocialSum(BigDecimalUtils.safeAdd( library.setPersonalSocialSum(BigDecimalUtils.safeAdd(
library.getPersonalBigailmentFee(), library.getPersonalBigailmentFee(),
library.getPersonalPensionFee(), library.getPersonalPensionFee(),
...@@ -1192,14 +1222,24 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1192,14 +1222,24 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
lib.setDeptNo(providentFund.getSettleDomainCodeFund()); lib.setDeptNo(providentFund.getSettleDomainCodeFund());
//判断是否允许补缴 是否可补缴 0:是 //判断是否允许补缴 是否可补缴 0:是
Integer monthT = null; Integer monthPension = null;
if (CommonConstants.ZERO_STRING.equals(providentFund.getCanOverpay())) { if (CommonConstants.ZERO_STRING.equals(providentFund.getCanOverpayPension())) {
//补缴是否含当月: 含当月
if (CommonConstants.ZERO_STRING.equals(providentFund.getHaveThisMonthPension())) {
monthPension = Integer.parseInt(DateUtil.getYearAndMonth(LocalDateTimeUtils.formatTime(providentFund.getCreateTime(), DateUtil.DATETIME_YYYYMM), 0));
//补缴是否含当月: 不含含当月
} else {
monthPension = Integer.parseInt(DateUtil.getYearAndMonth(LocalDateTimeUtils.formatTime(providentFund.getCreateTime(), DateUtil.DATETIME_YYYYMM), -CommonConstants.ONE_INT));
}
}
Integer monthMedical = null;
if (CommonConstants.ZERO_STRING.equals(providentFund.getCanOverpayMedical())) {
//补缴是否含当月: 含当月 //补缴是否含当月: 含当月
if (CommonConstants.ZERO_STRING.equals(providentFund.getHaveThisMonth())) { if (CommonConstants.ZERO_STRING.equals(providentFund.getHaveThisMonthMedical())) {
monthT = Integer.parseInt(DateUtil.getYearAndMonth(LocalDateTimeUtils.formatTime(providentFund.getCreateTime(), DateUtil.DATETIME_YYYYMM), 0)); monthMedical = Integer.parseInt(DateUtil.getYearAndMonth(LocalDateTimeUtils.formatTime(providentFund.getCreateTime(), DateUtil.DATETIME_YYYYMM), 0));
//补缴是否含当月: 不含含当月 //补缴是否含当月: 不含含当月
} else { } else {
monthT = Integer.parseInt(DateUtil.getYearAndMonth(LocalDateTimeUtils.formatTime(providentFund.getCreateTime(), DateUtil.DATETIME_YYYYMM), -CommonConstants.ONE_INT)); monthMedical = Integer.parseInt(DateUtil.getYearAndMonth(LocalDateTimeUtils.formatTime(providentFund.getCreateTime(), DateUtil.DATETIME_YYYYMM), -CommonConstants.ONE_INT));
} }
} }
// 判断公积金对应缴纳月份是否派减了 // 判断公积金对应缴纳月份是否派减了
...@@ -1209,17 +1249,21 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1209,17 +1249,21 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
} else { } else {
isReduceFund = false; isReduceFund = false;
} }
lib = initForecastLibrary(lib, null, providentFund, monthT, isReduceFund, isReduceSocial, null, historyLibrary, isOnly); lib = initForecastLibrary(lib, null, providentFund, monthPension, isReduceFund, isReduceSocial, null, historyLibrary, isOnly,monthMedical);
saveLibraryMap.put(mapKeyStr, lib); saveLibraryMap.put(mapKeyStr, lib);
} }
private void changeSocialInfoByBase(TSocialFundInfo social, SysBaseSetInfo socialSet) { private void changeSocialInfoByBase(TSocialFundInfo social, SysBaseSetInfo socialSet) {
if (Common.isNotNull(socialSet)) { if (Common.isNotNull(socialSet)) {
social.setCanOverpay(socialSet.getCanOverpay()); social.setCanOverpay(socialSet.getCanOverpay());
social.setCanOverpayPension(socialSet.getCanOverpayPension());
social.setCanOverpayMedical(socialSet.getCanOverpayMedical());
social.setSocialHousehold(socialSet.getDepartId()); social.setSocialHousehold(socialSet.getDepartId());
social.setCollectMoth(socialSet.getCollectMoth()); social.setCollectMoth(socialSet.getCollectMoth());
social.setCollectType(socialSet.getCollectType()); social.setCollectType(socialSet.getCollectType());
social.setHaveThisMonth(socialSet.getHaveThisMonth()); social.setHaveThisMonth(socialSet.getHaveThisMonth());
social.setHaveThisMonthPension(socialSet.getHaveThisMonthPension());
social.setHaveThisMonthMedical(socialSet.getHaveThisMonthMedical());
social.setInsuranceBigailment(socialSet.getInsuranceBigailment()); social.setInsuranceBigailment(socialSet.getInsuranceBigailment());
social.setInsuranceBirth(socialSet.getInsuranceBirth()); social.setInsuranceBirth(socialSet.getInsuranceBirth());
social.setInsuranceInjury(socialSet.getInsuranceInjury()); social.setInsuranceInjury(socialSet.getInsuranceInjury());
...@@ -1230,6 +1274,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1230,6 +1274,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
social.setIsChargePersonal(socialSet.getIsChargePersonal()); social.setIsChargePersonal(socialSet.getIsChargePersonal());
social.setIsIllness(socialSet.getIsIllness()); social.setIsIllness(socialSet.getIsIllness());
social.setOverpayNumber(socialSet.getOverpayNumber()); social.setOverpayNumber(socialSet.getOverpayNumber());
social.setOverpayNumberPension(socialSet.getOverpayNumberPension());
social.setOverpayNumberMedical(socialSet.getOverpayNumberMedical());
social.setValueType(socialSet.getValueType()); social.setValueType(socialSet.getValueType());
social.setLowerLimit(socialSet.getLowerLimit()); social.setLowerLimit(socialSet.getLowerLimit());
social.setUpperLimit(socialSet.getUpperLimit()); social.setUpperLimit(socialSet.getUpperLimit());
......
...@@ -73,6 +73,16 @@ ...@@ -73,6 +73,16 @@
<result property="insuranceBirth" column="INSURANCE_BIRTH"/> <result property="insuranceBirth" column="INSURANCE_BIRTH"/>
<result property="insuranceBigailment" column="INSURANCE_BIGAILMENT"/> <result property="insuranceBigailment" column="INSURANCE_BIGAILMENT"/>
<result property="insuranceIsLatestCardinality" column="INSURANCE_IS_LATEST_CARDINALITY"/> <result property="insuranceIsLatestCardinality" column="INSURANCE_IS_LATEST_CARDINALITY"/>
<result property="canOverpayPension" column="CAN_OVERPAY_PENSION"/>
<result property="haveThisMonthPension" column="HAVE_THIS_MONTH_PENSION"/>
<result property="overpayNumberPension" column="OVERPAY_NUMBER_PENSION"/>
<result property="baseTypePension" column="BASE_TYPE_PENSION"/>
<result property="payPolicyPension" column="PAY_POLICY_PENSION"/>
<result property="canOverpayMedical" column="CAN_OVERPAY_MEDICAL"/>
<result property="haveThisMonthMedical" column="HAVE_THIS_MONTH_MEDICAL"/>
<result property="overpayNumberMedical" column="OVERPAY_NUMBER_MEDICAL"/>
<result property="baseTypeMedical" column="BASE_TYPE_MEDICAL"/>
<result property="payPolicyMedical" column="PAY_POLICY_MEDICAL"/>
<result property="deleteFlag" column="DELETE_FLAG"/> <result property="deleteFlag" column="DELETE_FLAG"/>
<result property="departName" column="DEPART_NAME"/> <result property="departName" column="DEPART_NAME"/>
<result property="doMonth" column="DO_MONTH"/> <result property="doMonth" column="DO_MONTH"/>
...@@ -168,7 +178,17 @@ ...@@ -168,7 +178,17 @@
LOWER_INJURY, LOWER_INJURY,
LOWER_BIRTH, LOWER_BIRTH,
IS_SAME_BASE, IS_SAME_BASE,
LOWER_BIG LOWER_BIG,
CAN_OVERPAY_PENSION,
HAVE_THIS_MONTH_PENSION,
OVERPAY_NUMBER_PENSION,
BASE_TYPE_PENSION,
PAY_POLICY_PENSION,
CAN_OVERPAY_MEDICAL,
HAVE_THIS_MONTH_MEDICAL,
OVERPAY_NUMBER_MEDICAL,
BASE_TYPE_MEDICAL,
PAY_POLICY_MEDICAL
</sql> </sql>
<sql id="sysBaseSetInfo_where"> <sql id="sysBaseSetInfo_where">
<if test="sysBaseSetInfo != null"> <if test="sysBaseSetInfo != null">
...@@ -330,6 +350,36 @@ ...@@ -330,6 +350,36 @@
<if test="sysBaseSetInfo.insuranceIsLatestCardinality != null and sysBaseSetInfo.insuranceIsLatestCardinality.trim() != ''"> <if test="sysBaseSetInfo.insuranceIsLatestCardinality != null and sysBaseSetInfo.insuranceIsLatestCardinality.trim() != ''">
AND a.INSURANCE_IS_LATEST_CARDINALITY = #{sysBaseSetInfo.insuranceIsLatestCardinality} AND a.INSURANCE_IS_LATEST_CARDINALITY = #{sysBaseSetInfo.insuranceIsLatestCardinality}
</if> </if>
<if test="sysBaseSetInfo.canOverpayPension != null and sysBaseSetInfo.canOverpayPension.trim() != ''">
AND a.CAN_OVERPAY_PENSION = #{sysBaseSetInfo.canOverpayPension}
</if>
<if test="sysBaseSetInfo.haveThisMonthPension != null and sysBaseSetInfo.haveThisMonthPension.trim() != ''">
AND a.HAVE_THIS_MONTH_PENSION = #{sysBaseSetInfo.haveThisMonthPension}
</if>
<if test="sysBaseSetInfo.overpayNumberPension != null">
AND a.OVERPAY_NUMBER_PENSION = #{sysBaseSetInfo.overpayNumberPension}
</if>
<if test="sysBaseSetInfo.baseTypePension != null and sysBaseSetInfo.baseTypePension.trim() != ''">
AND a.BASE_TYPE_PENSION = #{sysBaseSetInfo.baseTypePension}
</if>
<if test="sysBaseSetInfo.payPolicyPension != null and sysBaseSetInfo.payPolicyPension.trim() != ''">
AND a.PAY_POLICY_PENSION = #{sysBaseSetInfo.payPolicyPension}
</if>
<if test="sysBaseSetInfo.canOverpayMedical != null and sysBaseSetInfo.canOverpayMedical.trim() != ''">
AND a.CAN_OVERPAY_MEDICAL = #{sysBaseSetInfo.canOverpayMedical}
</if>
<if test="sysBaseSetInfo.haveThisMonthMedical != null and sysBaseSetInfo.haveThisMonthMedical.trim() != ''">
AND a.HAVE_THIS_MONTH_MEDICAL = #{sysBaseSetInfo.haveThisMonthMedical}
</if>
<if test="sysBaseSetInfo.overpayNumberMedical != null">
AND a.OVERPAY_NUMBER_MEDICAL = #{sysBaseSetInfo.overpayNumberMedical}
</if>
<if test="sysBaseSetInfo.baseTypeMedical != null and sysBaseSetInfo.baseTypeMedical.trim() != ''">
AND a.BASE_TYPE_MEDICAL = #{sysBaseSetInfo.baseTypeMedical}
</if>
<if test="sysBaseSetInfo.payPolicyMedical != null and sysBaseSetInfo.payPolicyMedical.trim() != ''">
AND a.PAY_POLICY_MEDICAL = #{sysBaseSetInfo.payPolicyMedical}
</if>
<if test="sysBaseSetInfo.deleteFlag != null and sysBaseSetInfo.deleteFlag.trim() != ''"> <if test="sysBaseSetInfo.deleteFlag != null and sysBaseSetInfo.deleteFlag.trim() != ''">
AND a.DELETE_FLAG = #{sysBaseSetInfo.deleteFlag} AND a.DELETE_FLAG = #{sysBaseSetInfo.deleteFlag}
</if> </if>
...@@ -531,21 +581,30 @@ ...@@ -531,21 +581,30 @@
a.PERSONAL_UNEMPLOYMENT_PRO personalUnemploymentPro, a.PERSONAL_UNEMPLOYMENT_PRO personalUnemploymentPro,
IF(a.IS_ILLNESS='0',IF(a.VALUE_TYPE='1',a.PAY_COMPANY_PRO,""),"") payCompanyPro, IF(a.IS_ILLNESS='0',IF(a.VALUE_TYPE='1',a.PAY_COMPANY_PRO,""),"") payCompanyPro,
IF(a.IS_ILLNESS='0',IF(a.VALUE_TYPE='1',a.PAY_PERSONAL_PRO,""),"") payPersonalPro, IF(a.IS_ILLNESS='0',IF(a.VALUE_TYPE='1',a.PAY_PERSONAL_PRO,""),"") payPersonalPro,
a.CAN_OVERPAY canOverpay,
a.UNIT_PRO_SUM unitProSum, a.UNIT_PRO_SUM unitProSum,
a.PERSONAL_PRO_SUM personalProSum, a.PERSONAL_PRO_SUM personalProSum,
-- 社保补缴险种字段
CONCAT_WS(',', CONCAT_WS(',',
CASE WHEN a.INSURANCE_PENSION=0 THEN '养老' ELSE NULL END, CASE WHEN a.INSURANCE_PENSION=0 THEN '养老' ELSE NULL END,
CASE WHEN a.INSURANCE_MEDICAL=0 THEN '医疗' ELSE NULL END,
CASE WHEN a.INSURANCE_INJURY=0 THEN '工伤' ELSE NULL END, CASE WHEN a.INSURANCE_INJURY=0 THEN '工伤' ELSE NULL END,
CASE WHEN a.INSURANCE_UNEMPLOYMENT=0 THEN '失业' ELSE NULL END, CASE WHEN a.INSURANCE_UNEMPLOYMENT=0 THEN '失业' ELSE NULL END
) as insurancePension,
a.CAN_OVERPAY_PENSION canOverpayPension,
a.HAVE_THIS_MONTH_PENSION haveThisMonthPension,
a.OVERPAY_NUMBER_PENSION overpayNumberPension,
a.BASE_TYPE_PENSION baseTypePension,
a.PAY_POLICY_PENSION payPolicyPension,
-- 医保补缴险种字段
CONCAT_WS(',',
CASE WHEN a.INSURANCE_MEDICAL=0 THEN '医疗' ELSE NULL END,
CASE WHEN a.INSURANCE_BIRTH=0 THEN '生育' ELSE NULL END, CASE WHEN a.INSURANCE_BIRTH=0 THEN '生育' ELSE NULL END,
CASE WHEN a.INSURANCE_BIGAILMENT=0 THEN '大病' ELSE NULL END CASE WHEN a.INSURANCE_BIGAILMENT=0 THEN '大病' ELSE NULL END
) as insurancePension, ) as insurancePensionMedical,
a.OVERPAY_NUMBER overpayNumber, a.CAN_OVERPAY_MEDICAL canOverpayMedical,
a.HAVE_THIS_MONTH haveThisMonth, a.HAVE_THIS_MONTH_MEDICAL haveThisMonthMedical,
a.INSURANCE_IS_LATEST_CARDINALITY insuranceIsLatestCardinality, a.OVERPAY_NUMBER_MEDICAL overpayNumberMedical,
a.PAY_POLICY payPolicy a.BASE_TYPE_MEDICAL baseTypeMedical,
a.PAY_POLICY_MEDICAL payPolicyMedical
FROM sys_base_set_info a FROM sys_base_set_info a
LEFT JOIN sys_area a1 on a1.id=a.PROVINCE LEFT JOIN sys_area a1 on a1.id=a.PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.CITY LEFT JOIN sys_area a2 on a2.id=a.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