Skip to content

Y
yifu-mvp
Commit d4792c05 authored by huyuchen's avatar huyuchen
Browse files
Options

薪资审核页面接口修改

parent c957e4b9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 330 additions and 332 deletions
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @ d4792c05
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
AND a.SALARY_MONTH = #{tSalaryStandard.salaryMonth} AND a.SALARY_MONTH = #{tSalaryStandard.salaryMonth}
</if> </if>
<if test="tSalaryStandard.status == null"> <if test="tSalaryStandard.status == null">
AND a.STATUS = 1 OR a.STATUS = 2 AND a.STATUS = 1 OR a.STATUS = 2 OR a.STATUS = 5
</if> </if>
<if test="tSalaryStandard.status != null"> <if test="tSalaryStandard.status != null">
AND a.STATUS = #{tSalaryStandard.status} AND a.STATUS = #{tSalaryStandard.status}
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @ d4792c05
...@@ -195,7 +195,7 @@ public class TPaymentInfo extends BaseEntity { ...@@ -195,7 +195,7 @@ public class TPaymentInfo extends BaseEntity {
/** /**
* 公积金缴纳地-省 * 公积金缴纳地-省
*/ */
@ExcelAttribute(name = "公积金缴纳地-省" ) @ExcelAttribute(name = "公积金缴纳地-省", isArea = true)
@Schema(description ="公积金缴纳地-省") @Schema(description ="公积金缴纳地-省")
@ExcelProperty("公积金缴纳地-省") @ExcelProperty("公积金缴纳地-省")
private String fundProvince; private String fundProvince;
...@@ -203,7 +203,7 @@ public class TPaymentInfo extends BaseEntity { ...@@ -203,7 +203,7 @@ public class TPaymentInfo extends BaseEntity {
/** /**
* 公积金缴纳地-市 * 公积金缴纳地-市
*/ */
@ExcelAttribute(name = "公积金缴纳地-市" ) @ExcelAttribute(name = "公积金缴纳地-市",isArea = true, parentField = "fundProvince")
@Schema(description ="公积金缴纳地-市") @Schema(description ="公积金缴纳地-市")
@ExcelProperty("公积金缴纳地-市") @ExcelProperty("公积金缴纳地-市")
private String fundCity; private String fundCity;
...@@ -211,7 +211,7 @@ public class TPaymentInfo extends BaseEntity { ...@@ -211,7 +211,7 @@ public class TPaymentInfo extends BaseEntity {
/** /**
* 公积金缴纳地-县 * 公积金缴纳地-县
*/ */
@ExcelAttribute(name = "公积金缴纳地-县" ) @ExcelAttribute(name = "公积金缴纳地-县",isArea = true, parentField = "fundCity")
@Schema(description ="公积金缴纳地-县") @Schema(description ="公积金缴纳地-县")
@ExcelProperty("公积金缴纳地-县") @ExcelProperty("公积金缴纳地-县")
private String fundTown; private String fundTown;
...@@ -219,7 +219,7 @@ public class TPaymentInfo extends BaseEntity { ...@@ -219,7 +219,7 @@ public class TPaymentInfo extends BaseEntity {
/** /**
* 社保缴纳地-省 * 社保缴纳地-省
*/ */
@ExcelAttribute(name = "社保缴纳地-省" ) @ExcelAttribute(name = "社保缴纳地-省",isArea = true)
@Schema(description ="社保缴纳地-省") @Schema(description ="社保缴纳地-省")
@ExcelProperty("社保缴纳地-省") @ExcelProperty("社保缴纳地-省")
private String socialProvince; private String socialProvince;
...@@ -227,7 +227,7 @@ public class TPaymentInfo extends BaseEntity { ...@@ -227,7 +227,7 @@ public class TPaymentInfo extends BaseEntity {
/** /**
* 社保缴纳地-市 * 社保缴纳地-市
*/ */
@ExcelAttribute(name = "社保缴纳地-市" ) @ExcelAttribute(name = "社保缴纳地-市", isArea = true, parentField = "socialProvince")
@Schema(description ="社保缴纳地-市") @Schema(description ="社保缴纳地-市")
@ExcelProperty("社保缴纳地-市") @ExcelProperty("社保缴纳地-市")
private String socialCity; private String socialCity;
...@@ -235,7 +235,7 @@ public class TPaymentInfo extends BaseEntity { ...@@ -235,7 +235,7 @@ public class TPaymentInfo extends BaseEntity {
/** /**
* 社保缴纳地-县 * 社保缴纳地-县
*/ */
@ExcelAttribute(name = "社保缴纳地-县" ) @ExcelAttribute(name = "社保缴纳地-县", isArea = true, parentField = "socialCity")
@Schema(description ="社保缴纳地-县") @Schema(description ="社保缴纳地-县")
@ExcelProperty("社保缴纳地-县") @ExcelProperty("社保缴纳地-县")
private String socialTown; private String socialTown;
...@@ -367,51 +367,33 @@ public class TPaymentInfo extends BaseEntity { ...@@ -367,51 +367,33 @@ public class TPaymentInfo extends BaseEntity {
/** /**
* 单位养老基数 * 单位养老基数
*/ */
@ExcelAttribute(name = "单位养老基数" ) @ExcelAttribute(name = "单位养老基数", isFloat = true,max = "999999999.99")
@ExcelProperty("单位养老基数") @ExcelProperty("单位养老基数")
private BigDecimal unitPensionSet; private BigDecimal unitPensionSet;
/** /**
* 单位医疗基数 * 单位医疗基数
*/ */
@ExcelAttribute(name = "单位医疗基数" ) @ExcelAttribute(name = "单位医疗基数", isFloat = true,max = "999999999.99")
@ExcelProperty("单位医疗基数") @ExcelProperty("单位医疗基数")
private BigDecimal unitMedicalSet; private BigDecimal unitMedicalSet;
/** /**
* 单位失业基数 * 单位失业基数
*/ */
@ExcelAttribute(name = "单位失业基数" ) @ExcelAttribute(name = "单位失业基数", isFloat = true,max = "999999999.99")
@ExcelProperty("单位失业基数") @ExcelProperty("单位失业基数")
private BigDecimal unitUnemploymentSet; private BigDecimal unitUnemploymentSet;
/** /**
* 单位工伤基数 * 工伤基数
*/ */
@ExcelAttribute(name = "单位工伤基数" ) @ExcelAttribute(name = "工伤基数", isFloat = true,max = "999999999.99")
@ExcelProperty("单位工伤基数") @ExcelProperty("工伤基数")
private BigDecimal unitInjurySet; private BigDecimal unitInjurySet;
/** /**
* 单位生育基数 * 生育基数
*/ */
@ExcelAttribute(name = "单位生育基数" ) @ExcelAttribute(name = "生育基数", isFloat = true,max = "999999999.99")
@ExcelProperty("单位生育基数") @ExcelProperty("生育基数")
private BigDecimal unitBirthSet; private BigDecimal unitBirthSet;
/**
* 个人养老基数
*/
@ExcelAttribute(name = "个人养老基数")
@ExcelProperty("个人养老基数")
private BigDecimal personalPensionSet;
/**
* 个人医疗基数
*/
@ExcelAttribute(name = "个人医疗基数")
@ExcelProperty("个人医疗基数")
private BigDecimal personalMedicalSet;
/**
* 个人失业基数
*/
@ExcelAttribute(name = "个人失业基数")
@ExcelProperty("个人失业基数")
private BigDecimal personalUnemploymentSet;
/** /**
* 单位养老比例 * 单位养老比例
*/ */
...@@ -535,14 +517,14 @@ public class TPaymentInfo extends BaseEntity { ...@@ -535,14 +517,14 @@ public class TPaymentInfo extends BaseEntity {
/** /**
* 公积金编号 * 公积金编号
*/ */
@ExcelAttribute(name = "公积金编号", maxLength = 50) @ExcelAttribute(name = "公积金编号", maxLength = 20)
@Size(max = 50, message = "公积金编号不可超过50位") @Size(max = 20, message = "公积金编号不可超过20位")
@ExcelProperty("公积金编号") @ExcelProperty("公积金编号")
private String providentNo; private String providentNo;
/** /**
* 单位公积金基数 * 单位公积金基数
*/ */
@ExcelAttribute(name = "单位公积金基数") @ExcelAttribute(name = "单位公积金基数", isFloat = true,max = "999999999.99")
@ExcelProperty("单位公积金基数") @ExcelProperty("单位公积金基数")
private BigDecimal unitProvidentSet; private BigDecimal unitProvidentSet;
/** /**
...@@ -560,7 +542,7 @@ public class TPaymentInfo extends BaseEntity { ...@@ -560,7 +542,7 @@ public class TPaymentInfo extends BaseEntity {
/** /**
* 个人公积金基数 * 个人公积金基数
*/ */
@ExcelAttribute(name = "个人公积金基数") @ExcelAttribute(name = "个人公积金基数", isFloat = true,max = "999999999.99")
@ExcelProperty("个人公积金基数") @ExcelProperty("个人公积金基数")
private BigDecimal personalProidentSet; private BigDecimal personalProidentSet;
/** /**
...@@ -570,5 +552,17 @@ public class TPaymentInfo extends BaseEntity { ...@@ -570,5 +552,17 @@ public class TPaymentInfo extends BaseEntity {
@ExcelProperty("个人公积金费用") @ExcelProperty("个人公积金费用")
private BigDecimal personalProvidentSum; private BigDecimal personalProvidentSum;
/**
* 工资社保结算状态 0: 未结算 1: 待结算 2: 已结算
*/
@ExcelAttribute(name = "工资社保结算状态", maxLength = 1,isDataId = true,dataType = "settlement_flag")
@ExcelProperty("工资社保结算状态")
private String salarySocialFlag;
/**
* 工资公积金结算状态 0: 未结算 1: 待结算 2: 已结算
*/
@ExcelAttribute(name = "工资公积金结算状态", maxLength = 1,isDataId = true,dataType = "settlement_flag")
@ExcelProperty("工资公积金结算状态")
private String salaryFundFlag;
} }
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
View file @ d4792c05
...@@ -99,7 +99,7 @@ public class TPreDispatchInfo extends BaseEntity { ...@@ -99,7 +99,7 @@ public class TPreDispatchInfo extends BaseEntity {
@Schema(description ="身份证号") @Schema(description ="身份证号")
@NotNull(message = "身份证号码不可为空") @NotNull(message = "身份证号码不可为空")
@Size(max = 20, message = "身份证号码不可超过20位") @Size(max = 20, message = "身份证号码不可超过20位")
@ExcelAttribute(name = "身份证号", isNotEmpty = true,errorInfo = "身份证号不能为空", maxLength = 20, isIdCard = true) @ExcelAttribute(name = "身份证号", isNotEmpty = true,errorInfo = "身份证号不能为空", maxLength = 20)
private String empIdcard; private String empIdcard;
/** /**
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentHeFeiVo.java
View file @ d4792c05
...@@ -92,10 +92,9 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable { ...@@ -92,10 +92,9 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable {
@ExcelProperty("社保缴纳地-县") @ExcelProperty("社保缴纳地-县")
private Integer socialTown; private Integer socialTown;
/** /**
* 社保缴纳月份empNo * 社保缴纳月份
*/ */
@Length(max = 6, message = "社保缴纳月份不能超过6个字符") @ExcelAttribute(name = "社保缴纳月份", isNotEmpty = true, errorInfo = "社保缴纳月份不可为空", maxLength = 6, min = 6, isInteger = true)
@ExcelAttribute(name = "社保缴纳月份", isNotEmpty = true, errorInfo = "社保缴纳月份不可为空", maxLength = 6,isInteger = true)
@Schema(description = "社保缴纳月份") @Schema(description = "社保缴纳月份")
@ExcelProperty("社保缴纳月份") @ExcelProperty("社保缴纳月份")
private String socialPayMonth; private String socialPayMonth;
...@@ -103,7 +102,7 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable { ...@@ -103,7 +102,7 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable {
* 社保生成月份 * 社保生成月份
*/ */
@Length(max = 6, message = "社保生成月份不能超过6个字符") @Length(max = 6, message = "社保生成月份不能超过6个字符")
@ExcelAttribute(name = "社保生成月份", isNotEmpty = true, errorInfo = "社保生成月份不可为空", maxLength = 6,isInteger = true) @ExcelAttribute(name = "社保生成月份", isNotEmpty = true, errorInfo = "社保生成月份不可为空", maxLength = 6, min = 6,isInteger = true)
@Schema(description = "社保生成月份") @Schema(description = "社保生成月份")
@ExcelProperty("社保生成月份") @ExcelProperty("社保生成月份")
private String socialCreateMonth; private String socialCreateMonth;
...@@ -118,14 +117,14 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable { ...@@ -118,14 +117,14 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable {
/** /**
* 个人缴费基数 * 个人缴费基数
*/ */
@ExcelAttribute(name = "个人缴费基数") @ExcelAttribute(name = "个人缴费基数", isFloat = true,max = "999999999.99")
@Schema(description = "个人缴费基数") @Schema(description = "个人缴费基数")
@ExcelProperty("个人缴费基数") @ExcelProperty("个人缴费基数")
private BigDecimal personalSet; private BigDecimal personalSet;
/** /**
* 单位缴费基数 * 单位缴费基数
*/ */
@ExcelAttribute(name = "单位缴费基数") @ExcelAttribute(name = "单位缴费基数", isFloat = true,max = "999999999.99")
@Schema(description = "单位缴费基数") @Schema(description = "单位缴费基数")
@ExcelProperty("单位缴费基数") @ExcelProperty("单位缴费基数")
private BigDecimal unitSet; private BigDecimal unitSet;
...@@ -133,14 +132,14 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable { ...@@ -133,14 +132,14 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable {
/** /**
* 个人缴费额 * 个人缴费额
*/ */
@ExcelAttribute(name = "个人缴费额") @ExcelAttribute(name = "个人缴费额", isFloat = true,max = "999999999.99")
@Schema(description = "个人缴费额") @Schema(description = "个人缴费额")
@ExcelProperty("个人缴费额") @ExcelProperty("个人缴费额")
private BigDecimal personalMoney; private BigDecimal personalMoney;
/** /**
* 单位缴费额 * 单位缴费额
*/ */
@ExcelAttribute(name = "单位缴费额") @ExcelAttribute(name = "单位缴费额", isFloat = true,max = "999999999.99")
@Schema(description = "单位缴费额") @Schema(description = "单位缴费额")
@ExcelProperty("单位缴费额") @ExcelProperty("单位缴费额")
private BigDecimal unitMoney; private BigDecimal unitMoney;
...@@ -148,21 +147,21 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable { ...@@ -148,21 +147,21 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable {
/** /**
* 医保基数 * 医保基数
*/ */
@ExcelAttribute(name = "医保基数") @ExcelAttribute(name = "医保基数", isFloat = true,max = "999999999.99")
@Schema(description = "医保基数") @Schema(description = "医保基数")
@ExcelProperty("医保基数") @ExcelProperty("医保基数")
private BigDecimal medicalSet; private BigDecimal medicalSet;
/** /**
* 医保单位缴费 * 医保单位缴费
*/ */
@ExcelAttribute(name = "医保单位缴费") @ExcelAttribute(name = "医保单位缴费", isFloat = true,max = "999999999.99")
@Schema(description = "医保单位缴费") @Schema(description = "医保单位缴费")
@ExcelProperty("医保单位缴费") @ExcelProperty("医保单位缴费")
private BigDecimal unitMedicalMoney; private BigDecimal unitMedicalMoney;
/** /**
* 医保个人缴费 * 医保个人缴费
*/ */
@ExcelAttribute(name = "医保个人缴费") @ExcelAttribute(name = "医保个人缴费", isFloat = true,max = "999999999.99")
@Schema(description = "医保个人缴费") @Schema(description = "医保个人缴费")
@ExcelProperty("医保个人缴费") @ExcelProperty("医保个人缴费")
private BigDecimal personalMedicalMoney; private BigDecimal personalMedicalMoney;
...@@ -170,7 +169,7 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable { ...@@ -170,7 +169,7 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable {
/** /**
* 单位医疗救助金 (对应单位大病) * 单位医疗救助金 (对应单位大病)
*/ */
@ExcelAttribute(name = "单位医疗救助金") @ExcelAttribute(name = "单位医疗救助金", isFloat = true,max = "999999999.99")
@Schema(description = "单位医疗救助金") @Schema(description = "单位医疗救助金")
@ExcelProperty("单位医疗救助金") @ExcelProperty("单位医疗救助金")
private BigDecimal unitBigailmentMoney; private BigDecimal unitBigailmentMoney;
...@@ -178,7 +177,7 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable { ...@@ -178,7 +177,7 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable {
/** /**
* 个人医疗救助金 (对应个人大病) * 个人医疗救助金 (对应个人大病)
*/ */
@ExcelAttribute(name = "个人医疗救助金") @ExcelAttribute(name = "个人医疗救助金", isFloat = true,max = "999999999.99")
@Schema(description = "个人医疗救助金") @Schema(description = "个人医疗救助金")
@ExcelProperty("个人医疗救助金") @ExcelProperty("个人医疗救助金")
private BigDecimal personalBigailmentMoney; private BigDecimal personalBigailmentMoney;
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchReduceVo.java
View file @ d4792c05
...@@ -396,11 +396,11 @@ public class TPreDispatchReduceVo { ...@@ -396,11 +396,11 @@ public class TPreDispatchReduceVo {
private String pensionAddressReduce; private String pensionAddressReduce;
/** /**
* 养老截止时间 * 养老时间
*/ */
@Schema(description ="养老截止时间") @Schema(description ="养老时间")
@Length(max = 6, message = "养老时间不能超过6个字符") @Length(max = 6, message = "养老时间不能超过6个字符")
@ExcelAttribute(name = "养老时间", maxLength = 6, isInteger = true) @ExcelAttribute(name = "养老时间", maxLength = 6, min = 6, isInteger = true)
private String pensionEndReduce; private String pensionEndReduce;
/** /**
...@@ -415,7 +415,7 @@ public class TPreDispatchReduceVo { ...@@ -415,7 +415,7 @@ public class TPreDispatchReduceVo {
*/ */
@Schema(description ="医疗时间") @Schema(description ="医疗时间")
@Length(max = 6, message = "医疗时间不能超过6个字符") @Length(max = 6, message = "医疗时间不能超过6个字符")
@ExcelAttribute(name = "医疗时间", maxLength = 6, isInteger = true) @ExcelAttribute(name = "医疗时间", maxLength = 6, min = 6, isInteger = true)
private String medicalEndReduce; private String medicalEndReduce;
/** /**
...@@ -423,7 +423,7 @@ public class TPreDispatchReduceVo { ...@@ -423,7 +423,7 @@ public class TPreDispatchReduceVo {
*/ */
@Schema(description ="工伤时间") @Schema(description ="工伤时间")
@Length(max = 6, message = "工伤时间不能超过6个字符") @Length(max = 6, message = "工伤时间不能超过6个字符")
@ExcelAttribute(name = "工伤时间", maxLength = 6, isInteger = true) @ExcelAttribute(name = "工伤时间", maxLength = 6, min = 6, isInteger = true)
private String injuryEndReduce; private String injuryEndReduce;
/** /**
...@@ -438,7 +438,7 @@ public class TPreDispatchReduceVo { ...@@ -438,7 +438,7 @@ public class TPreDispatchReduceVo {
*/ */
@Schema(description ="生育时间") @Schema(description ="生育时间")
@Length(max = 6, message = "生育时间不能超过6个字符") @Length(max = 6, message = "生育时间不能超过6个字符")
@ExcelAttribute(name = "生育时间", maxLength = 6, isInteger = true) @ExcelAttribute(name = "生育时间", maxLength = 6, min = 6, isInteger = true)
private String birthEndReduce; private String birthEndReduce;
/** /**
...@@ -468,7 +468,7 @@ public class TPreDispatchReduceVo { ...@@ -468,7 +468,7 @@ public class TPreDispatchReduceVo {
*/ */
@Schema(description ="公积金时间") @Schema(description ="公积金时间")
@Length(max = 6, message = "公积金时间不能超过6个字符") @Length(max = 6, message = "公积金时间不能超过6个字符")
@ExcelAttribute(name = "公积金时间", maxLength = 6, isInteger = true) @ExcelAttribute(name = "公积金时间", maxLength = 6, min = 6, isInteger = true)
private String fundEndReduce; private String fundEndReduce;
/** /**
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchUpdateVo.java
View file @ d4792c05
...@@ -330,7 +330,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -330,7 +330,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 医疗截止时间 * 医疗截止时间
*/ */
@Length(max = 6, message = "医疗截止时间不能超过6个字符") @Length(max = 6, message = "医疗截止时间不能超过6个字符")
@ExcelAttribute(name = "医疗截止时间", maxLength = 6, isInteger = true) @ExcelAttribute(name = "医疗截止时间", maxLength = 6, min = 6, isInteger = true)
private String medicalEndReduce; private String medicalEndReduce;
/** /**
* 工伤截止城市 * 工伤截止城市
...@@ -342,7 +342,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -342,7 +342,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 工伤截止时间 * 工伤截止时间
*/ */
@Length(max = 6, message = "工伤截止时间不能超过6个字符") @Length(max = 6, message = "工伤截止时间不能超过6个字符")
@ExcelAttribute(name = "工伤截止时间", maxLength = 6, isInteger = true) @ExcelAttribute(name = "工伤截止时间", maxLength = 6, min = 6, isInteger = true)
private String injuryEndReduce; private String injuryEndReduce;
/** /**
* 生育截止城市 * 生育截止城市
...@@ -354,7 +354,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -354,7 +354,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 生育截止时间 * 生育截止时间
*/ */
@Length(max = 6, message = "生育截止时间不能超过6个字符") @Length(max = 6, message = "生育截止时间不能超过6个字符")
@ExcelAttribute(name = "生育截止时间", maxLength = 6, isInteger = true) @ExcelAttribute(name = "生育截止时间", maxLength = 6, min = 6, isInteger = true)
private String birthEndReduce; private String birthEndReduce;
/** /**
* 失业截止城市 * 失业截止城市
...@@ -366,7 +366,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -366,7 +366,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 失业截止时间 * 失业截止时间
*/ */
@Length(max = 6, message = "失业截止时间不能超过6个字符") @Length(max = 6, message = "失业截止时间不能超过6个字符")
@ExcelAttribute(name = "失业截止时间", maxLength = 6, isInteger = true) @ExcelAttribute(name = "失业截止时间", maxLength = 6, min = 6, isInteger = true)
private String unemploymentEndReduce; private String unemploymentEndReduce;
/** /**
* 公积金截止城市 * 公积金截止城市
...@@ -378,7 +378,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo { ...@@ -378,7 +378,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 公积金截止时间 * 公积金截止时间
*/ */
@Length(max = 6, message = "公积金截止时间不能超过6个字符") @Length(max = 6, message = "公积金截止时间不能超过6个字符")
@ExcelAttribute(name = "公积金截止时间", maxLength = 6, isInteger = true) @ExcelAttribute(name = "公积金截止时间", maxLength = 6, min = 6, isInteger = true)
private String fundEndReduce; private String fundEndReduce;
/** /**
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoImportLogController.java
View file @ d4792c05
...@@ -55,14 +55,14 @@ public class TPaymentInfoImportLogController { ...@@ -55,14 +55,14 @@ public class TPaymentInfoImportLogController {
@Operation(description = "导出社保导入日志") @Operation(description = "导出社保导入日志")
@GetMapping("/exportPaymentInfoLog") @GetMapping("/exportPaymentInfoLog")
public String exportPaymentInfoLog(HttpServletResponse response) { public String exportPaymentInfoLog() {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
String key = user.getId() + CommonConstants.DOWN_LINE_STRING + CommonConstants.PAYMENT_SOCIAL_WAIT_EXPORT; String key = user.getId() + CommonConstants.DOWN_LINE_STRING + CommonConstants.PAYMENT_SOCIAL_WAIT_EXPORT;
String importRandom = (String) redisUtil.get(key); String importRandom = (String) redisUtil.get(key);
if (StringUtils.isBlank(importRandom)) { if (StringUtils.isNotBlank(importRandom)) {
return importRandom; return importRandom;
} }
return null; return CommonConstants.ZERO_STRING;
} }
/** /**
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @ d4792c05
...@@ -55,6 +55,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -55,6 +55,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.InputStream; import java.io.InputStream;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.*; import java.util.*;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
...@@ -196,8 +197,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -196,8 +197,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
return R.failed("非本人创建的数据禁止删除！"); return R.failed("非本人创建的数据禁止删除！");
} }
if (CommonConstants.ZERO_STRING.equals(paymentInfo.getPushStatus()) && if (CommonConstants.ZERO_STRING.equals(paymentInfo.getPushStatus())) {
!CommonConstants.ONE_STRING.equals(user.getId())) {
return R.failed("已推送至结算平台禁止删除！"); return R.failed("已推送至结算平台禁止删除！");
} }
baseMapper.deleteById(id); baseMapper.deleteById(id);
...@@ -558,12 +558,16 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -558,12 +558,16 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} while (computeFlag); } while (computeFlag);
String importSuccessKey = user.getId() + CommonConstants.DOWN_LINE_STRING + CommonConstants.PAYMENT_SOCIAL_WAIT_EXPORT; String importSuccessKey = user.getId() + CommonConstants.DOWN_LINE_STRING + CommonConstants.PAYMENT_SOCIAL_WAIT_EXPORT;
DecimalFormat df = new DecimalFormat("0.00000");
String maerialRatio = df.format((float)atomicLine.get()/list.size()); // 创建一个数值格式化对象
NumberFormat numberFormat = NumberFormat.getInstance();
// 设置精确到小数点后2位
numberFormat.setMaximumFractionDigits(2);
String maerialRatio = numberFormat.format((float)atomicLine.get()/(float)list.size()*100);
redisUtil.set(importSuccessKey, maerialRatio, 1800L); redisUtil.set(importSuccessKey, maerialRatio, 1800L);
} catch (Exception e) { } catch (Exception e) {
log.error("社保缴费库数据批量导入异常：" + e); log.error("社保缴费库数据批量导入异常：" + e);
redisUtil.remove(key); redisUtil.remove(key);
} finally { } finally {
paymentInfoPensionMap.clear(); paymentInfoPensionMap.clear();
...@@ -1001,11 +1005,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1001,11 +1005,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo.setUnitUnemploymentSet(infoVo.getUnitUnemploymentSet()); paymentInfo.setUnitUnemploymentSet(infoVo.getUnitUnemploymentSet());
paymentInfo.setUnitUnemploymentPer(infoVo.getUnitUnemploymentPer()); paymentInfo.setUnitUnemploymentPer(infoVo.getUnitUnemploymentPer());
paymentInfo.setUnitBigailmentPer(infoVo.getUnitBigailmentPer()); paymentInfo.setUnitBigailmentPer(infoVo.getUnitBigailmentPer());
paymentInfo.setPersonalPensionSet(paymentInfo.getUnitPensionSet());
paymentInfo.setPersonalPensionPer(infoVo.getPersonalPensionPer()); paymentInfo.setPersonalPensionPer(infoVo.getPersonalPensionPer());
paymentInfo.setPersonalMedicalPer(infoVo.getPersonalMedicalPer()); paymentInfo.setPersonalMedicalPer(infoVo.getPersonalMedicalPer());
paymentInfo.setPersonalMedicalSet(paymentInfo.getUnitMedicalSet());
paymentInfo.setPersonalUnemploymentSet(paymentInfo.getUnitUnemploymentSet());
paymentInfo.setPersonalUnemploymentPer(infoVo.getPersonalUnemploymentPer()); paymentInfo.setPersonalUnemploymentPer(infoVo.getPersonalUnemploymentPer());
paymentInfo.setPersonalBigailmentPer(infoVo.getPersonalBigailmentPer()); paymentInfo.setPersonalBigailmentPer(infoVo.getPersonalBigailmentPer());
paymentInfo.setCompanyAccrual(infoVo.getCompanyAccrual()); paymentInfo.setCompanyAccrual(infoVo.getCompanyAccrual());
...@@ -1742,8 +1743,15 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -1742,8 +1743,15 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} }
} while (computeFlag); } while (computeFlag);
String importSuccessKey = user.getId() + CommonConstants.DOWN_LINE_STRING + CommonConstants.PAYMENT_SOCIAL_WAIT_EXPORT; String importSuccessKey = user.getId() + CommonConstants.DOWN_LINE_STRING + CommonConstants.PAYMENT_SOCIAL_WAIT_EXPORT;
redisUtil.set(importSuccessKey, random, 1800L);
// 创建一个数值格式化对象
NumberFormat numberFormat = NumberFormat.getInstance();
// 设置精确到小数点后2位
numberFormat.setMaximumFractionDigits(2);
String maerialRatio = numberFormat.format((float)atomicLine.get()/(float)list.size()*100);
redisUtil.set(importSuccessKey, maerialRatio, 1800L);
} catch (Exception e) { } catch (Exception e) {
log.error("社保缴费库数据批量导入异常：" + e); log.error("社保缴费库数据批量导入异常：" + e);
...@@ -2054,11 +2062,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2054,11 +2062,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists.setUnitPensionMoney(infoVo.getUnitMoney()); payExists.setUnitPensionMoney(infoVo.getUnitMoney());
payExists.setPersonalPensionMoney(infoVo.getPersonalMoney()); payExists.setPersonalPensionMoney(infoVo.getPersonalMoney());
payExists.setUnitPensionSet(infoVo.getUnitSet()); payExists.setUnitPensionSet(infoVo.getUnitSet());
payExists.setPersonalPensionSet(infoVo.getPersonalSet());
payExists.setUnitPensionMoney(infoVo.getUnitMoney()); payExists.setUnitPensionMoney(infoVo.getUnitMoney());
payExists.setPersonalPensionMoney(infoVo.getPersonalMoney()); payExists.setPersonalPensionMoney(infoVo.getPersonalMoney());
payExists.setUnitPensionSet(infoVo.getUnitSet());
payExists.setPersonalPensionSet(infoVo.getPersonalSet());
payExists.setUnitSocialSum(BigDecimalUtils.safeAdd(payExists.getUnitPensionMoney() payExists.setUnitSocialSum(BigDecimalUtils.safeAdd(payExists.getUnitPensionMoney()
, payExists.getUnitSocialSum())); , payExists.getUnitSocialSum()));
payExists.setSocialSecurityPersonalSum(BigDecimalUtils.safeAdd(payExists.getPersonalPensionMoney() payExists.setSocialSecurityPersonalSum(BigDecimalUtils.safeAdd(payExists.getPersonalPensionMoney()
...@@ -2068,11 +2073,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2068,11 +2073,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists.setUnitUnemploymentMoney(infoVo.getUnitMoney()); payExists.setUnitUnemploymentMoney(infoVo.getUnitMoney());
payExists.setPersonalUnemploymentMoney(infoVo.getPersonalMoney()); payExists.setPersonalUnemploymentMoney(infoVo.getPersonalMoney());
payExists.setUnitUnemploymentSet(infoVo.getUnitSet()); payExists.setUnitUnemploymentSet(infoVo.getUnitSet());
payExists.setPersonalUnemploymentSet(infoVo.getPersonalSet());
payExists.setUnitUnemploymentMoney(infoVo.getUnitMoney()); payExists.setUnitUnemploymentMoney(infoVo.getUnitMoney());
payExists.setPersonalUnemploymentMoney(infoVo.getPersonalMoney()); payExists.setPersonalUnemploymentMoney(infoVo.getPersonalMoney());
payExists.setUnitUnemploymentSet(infoVo.getUnitSet()); payExists.setUnitUnemploymentSet(infoVo.getUnitSet());
payExists.setPersonalUnemploymentSet(infoVo.getPersonalSet());
payExists.setUnitSocialSum(BigDecimalUtils.safeAdd(payExists.getUnitUnemploymentMoney() payExists.setUnitSocialSum(BigDecimalUtils.safeAdd(payExists.getUnitUnemploymentMoney()
, payExists.getUnitSocialSum())); , payExists.getUnitSocialSum()));
payExists.setSocialSecurityPersonalSum(BigDecimalUtils.safeAdd(payExists.getPersonalUnemploymentMoney() payExists.setSocialSecurityPersonalSum(BigDecimalUtils.safeAdd(payExists.getPersonalUnemploymentMoney()
...@@ -2090,13 +2093,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2090,13 +2093,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
payExists.setUnitMedicalMoney(infoVo.getUnitMedicalMoney()); payExists.setUnitMedicalMoney(infoVo.getUnitMedicalMoney());
payExists.setUnitMedicalSet(infoVo.getMedicalSet()); payExists.setUnitMedicalSet(infoVo.getMedicalSet());
payExists.setPersonalMedicalMoney(infoVo.getPersonalMedicalMoney()); payExists.setPersonalMedicalMoney(infoVo.getPersonalMedicalMoney());
payExists.setPersonalMedicalSet(infoVo.getMedicalSet());
payExists.setPersonalBigmailmentMoney(infoVo.getPersonalBigailmentMoney()); payExists.setPersonalBigmailmentMoney(infoVo.getPersonalBigailmentMoney());
payExists.setUnitBigmailmentMoney(infoVo.getUnitBigailmentMoney()); payExists.setUnitBigmailmentMoney(infoVo.getUnitBigailmentMoney());
payExists.setUnitMedicalMoney(infoVo.getUnitMedicalMoney()); payExists.setUnitMedicalMoney(infoVo.getUnitMedicalMoney());
payExists.setUnitMedicalSet(infoVo.getMedicalSet()); payExists.setUnitMedicalSet(infoVo.getMedicalSet());
payExists.setPersonalMedicalMoney(infoVo.getPersonalMedicalMoney()); payExists.setPersonalMedicalMoney(infoVo.getPersonalMedicalMoney());
payExists.setPersonalMedicalSet(infoVo.getMedicalSet());
payExists.setPersonalBigmailmentMoney(infoVo.getPersonalBigailmentMoney()); payExists.setPersonalBigmailmentMoney(infoVo.getPersonalBigailmentMoney());
payExists.setUnitBigmailmentMoney(infoVo.getUnitBigailmentMoney()); payExists.setUnitBigmailmentMoney(infoVo.getUnitBigailmentMoney());
payExists.setSocialSecurityNo(infoVo.getSocialSecurityNo()); payExists.setSocialSecurityNo(infoVo.getSocialSecurityNo());
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @ d4792c05
...@@ -68,9 +68,6 @@ ...@@ -68,9 +68,6 @@
<result property="unitUnemploymentSet" column="UNIT_UNEMPLOYMENT_SET"/> <result property="unitUnemploymentSet" column="UNIT_UNEMPLOYMENT_SET"/>
<result property="unitInjurySet" column="UNIT_INJURY_SET"/> <result property="unitInjurySet" column="UNIT_INJURY_SET"/>
<result property="unitBirthSet" column="UNIT_BIRTH_SET"/> <result property="unitBirthSet" column="UNIT_BIRTH_SET"/>
<result property="personalPensionSet" column="PERSONAL_PENSION_SET"/>
<result property="personalMedicalSet" column="PERSONAL_MEDICAL_SET"/>
<result property="personalUnemploymentSet" column="PERSONAL_UNEMPLOYMENT_SET"/>
<result property="unitPensionPer" column="UNIT_PENSION_PER"/> <result property="unitPensionPer" column="UNIT_PENSION_PER"/>
<result property="unitMedicalPer" column="UNIT_MEDICAL_PER"/> <result property="unitMedicalPer" column="UNIT_MEDICAL_PER"/>
<result property="unitUnemploymentPer" column="UNIT_UNEMPLOYMENT_PER"/> <result property="unitUnemploymentPer" column="UNIT_UNEMPLOYMENT_PER"/>
...@@ -92,6 +89,8 @@ ...@@ -92,6 +89,8 @@
<result property="personalUnemploymentMoney" column="PERSONAL_UNEMPLOYMENT_MONEY"/> <result property="personalUnemploymentMoney" column="PERSONAL_UNEMPLOYMENT_MONEY"/>
<result property="personalBigmailmentMoney" column="PERSONAL_BIGMAILMENT_MONEY"/> <result property="personalBigmailmentMoney" column="PERSONAL_BIGMAILMENT_MONEY"/>
<result property="providentNo" column="PROVIDENT_NO"/> <result property="providentNo" column="PROVIDENT_NO"/>
<result property="salarySocialFlag" column="SALARY_SOCIAL_FLAG"/>
<result property="salaryFundFlag" column="SALARY_FUND_FLAG"/>
<result property="unitProvidentSet" column="UNIT_PROVIDENT_SET"/> <result property="unitProvidentSet" column="UNIT_PROVIDENT_SET"/>
<result property="providentPercent" column="PROVIDENT_PERCENT"/> <result property="providentPercent" column="PROVIDENT_PERCENT"/>
<result property="unitProvidentSum" column="UNIT_PROVIDENT_SUM"/> <result property="unitProvidentSum" column="UNIT_PROVIDENT_SUM"/>
...@@ -141,6 +140,8 @@ ...@@ -141,6 +140,8 @@
a.TELECOM_NUMBER, a.TELECOM_NUMBER,
a.SORT_TIME, a.SORT_TIME,
a.AGENT_ID, a.AGENT_ID,
a.SALARY_SOCIAL_FLAG,
a.SALARY_FUND_FLAG,
a.FINANCE_BILL_ID, a.FINANCE_BILL_ID,
a.COMPANY_ACCRUAL, a.COMPANY_ACCRUAL,
a.PERSONAL_ACCRUAL, a.PERSONAL_ACCRUAL,
...@@ -268,7 +269,7 @@ ...@@ -268,7 +269,7 @@
AND a.ID = #{tPaymentInfo.id} AND a.ID = #{tPaymentInfo.id}
</if> </if>
<if test="tPaymentInfo.empName != null and tPaymentInfo.empName.trim() != ''"> <if test="tPaymentInfo.empName != null and tPaymentInfo.empName.trim() != ''">
AND a.EMP_NAME like CONCAT(#{tPaymentInfo.empName},'%') AND a.EMP_NAME = #{tPaymentInfo.empName}
</if> </if>
<if test="tPaymentInfo.empNo != null and tPaymentInfo.empNo.trim() != ''"> <if test="tPaymentInfo.empNo != null and tPaymentInfo.empNo.trim() != ''">
AND a.EMP_NO like CONCAT(#{tPaymentInfo.empNo},'%') AND a.EMP_NO like CONCAT(#{tPaymentInfo.empNo},'%')
...@@ -277,7 +278,7 @@ ...@@ -277,7 +278,7 @@
AND a.EMP_ID = #{tPaymentInfo.empId} AND a.EMP_ID = #{tPaymentInfo.empId}
</if> </if>
<if test="tPaymentInfo.empIdcard != null and tPaymentInfo.empIdcard.trim() != ''"> <if test="tPaymentInfo.empIdcard != null and tPaymentInfo.empIdcard.trim() != ''">
AND a.EMP_IDCARD like CONCAT(#{tPaymentInfo.empIdcard},'%') AND a.EMP_IDCARD = #{tPaymentInfo.empIdcard}
</if> </if>
<if test="tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''"> <if test="tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''">
AND a.UNIT_ID = #{tPaymentInfo.unitId} AND a.UNIT_ID = #{tPaymentInfo.unitId}
...@@ -286,7 +287,7 @@ ...@@ -286,7 +287,7 @@
AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId} AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
</if> </if>
<if test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"> <if test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''">
AND a.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold} AND a.SOCIAL_HOUSEHOLD like CONCAT(#{tPaymentInfo.socialHousehold},'%')
</if> </if>
<if test="tPaymentInfo.socialSecurityNo != null and tPaymentInfo.socialSecurityNo.trim() != ''"> <if test="tPaymentInfo.socialSecurityNo != null and tPaymentInfo.socialSecurityNo.trim() != ''">
AND a.SOCIAL_SECURITY_NO like CONCAT(#{tPaymentInfo.socialSecurityNo},'%') AND a.SOCIAL_SECURITY_NO like CONCAT(#{tPaymentInfo.socialSecurityNo},'%')
...@@ -316,25 +317,16 @@ ...@@ -316,25 +317,16 @@
AND a.PROVIDENT_CREATE_MONTH = #{tPaymentInfo.providentCreateMonth} AND a.PROVIDENT_CREATE_MONTH = #{tPaymentInfo.providentCreateMonth}
</if> </if>
<if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"> <if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
AND a.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold} AND a.PROVIDENT_HOUSEHOLD like CONCAT(#{tPaymentInfo.providentHousehold},'%')
</if> </if>
<if test="tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''"> <if test="tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''">
AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr} AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr}
</if> </if>
<if test="tPaymentInfo.fundProvince != null and tPaymentInfo.fundProvince.trim() != ''">
AND a.FUND_PROVINCE = #{tPaymentInfo.fundProvince}
</if>
<if test="tPaymentInfo.fundCity != null and tPaymentInfo.fundCity.trim() != ''">
AND a.FUND_CITY = #{tPaymentInfo.fundCity}
</if>
<if test="tPaymentInfo.fundTown != null and tPaymentInfo.fundTown.trim() != ''">
AND a.FUND_TOWN = #{tPaymentInfo.fundTown}
</if>
<if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != ''"> <if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != ''">
AND a.SOCIAL_PROVINCE = #{tPaymentInfo.socialProvince} AND (a.SOCIAL_PROVINCE = '${tPaymentInfo.socialProvince}' or a.FUND_PROVINCE = '${tPaymentInfo.socialProvince}')
</if> </if>
<if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != ''"> <if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != ''">
AND a.SOCIAL_CITY = #{tPaymentInfo.socialCity} AND (a.SOCIAL_CITY = '${tPaymentInfo.socialCity}' or a.FUND_CITY = '${tPaymentInfo.socialCity}')
</if> </if>
<if test="tPaymentInfo.socialTown == null"> <if test="tPaymentInfo.socialTown == null">
<if test="tPaymentInfo.socialCity != null"> <if test="tPaymentInfo.socialCity != null">
...@@ -409,15 +401,6 @@ ...@@ -409,15 +401,6 @@
<if test="tPaymentInfo.unitBirthSet != null"> <if test="tPaymentInfo.unitBirthSet != null">
AND a.UNIT_BIRTH_SET = #{tPaymentInfo.unitBirthSet} AND a.UNIT_BIRTH_SET = #{tPaymentInfo.unitBirthSet}
</if> </if>
<if test="tPaymentInfo.personalPensionSet != null">
AND a.PERSONAL_PENSION_SET = #{tPaymentInfo.personalPensionSet}
</if>
<if test="tPaymentInfo.personalMedicalSet != null">
AND a.PERSONAL_MEDICAL_SET = #{tPaymentInfo.personalMedicalSet}
</if>
<if test="tPaymentInfo.personalUnemploymentSet != null">
AND a.PERSONAL_UNEMPLOYMENT_SET = #{tPaymentInfo.personalUnemploymentSet}
</if>
<if test="tPaymentInfo.unitPensionPer != null"> <if test="tPaymentInfo.unitPensionPer != null">
AND a.UNIT_PENSION_PER = #{tPaymentInfo.unitPensionPer} AND a.UNIT_PENSION_PER = #{tPaymentInfo.unitPensionPer}
</if> </if>
...@@ -527,7 +510,7 @@ ...@@ -527,7 +510,7 @@
AND a.ID = #{tPaymentInfo.id} AND a.ID = #{tPaymentInfo.id}
</if> </if>
<if test="tPaymentInfo.empName != null and tPaymentInfo.empName.trim() != ''"> <if test="tPaymentInfo.empName != null and tPaymentInfo.empName.trim() != ''">
AND a.EMP_NAME like CONCAT(#{tPaymentInfo.empName},'%') AND a.EMP_NAME = #{tPaymentInfo.empName}
</if> </if>
<if test="tPaymentInfo.empNo != null and tPaymentInfo.empNo.trim() != ''"> <if test="tPaymentInfo.empNo != null and tPaymentInfo.empNo.trim() != ''">
AND a.EMP_NO like CONCAT(#{tPaymentInfo.empNo},'%') AND a.EMP_NO like CONCAT(#{tPaymentInfo.empNo},'%')
...@@ -536,7 +519,7 @@ ...@@ -536,7 +519,7 @@
AND a.EMP_ID = #{tPaymentInfo.empId} AND a.EMP_ID = #{tPaymentInfo.empId}
</if> </if>
<if test="tPaymentInfo.empIdcard != null and tPaymentInfo.empIdcard.trim() != ''"> <if test="tPaymentInfo.empIdcard != null and tPaymentInfo.empIdcard.trim() != ''">
AND a.EMP_IDCARD like CONCAT(#{tPaymentInfo.empIdcard},'%') AND a.EMP_IDCARD = #{tPaymentInfo.empIdcard}
</if> </if>
<if test="tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''"> <if test="tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''">
AND a.UNIT_ID = #{tPaymentInfo.unitId} AND a.UNIT_ID = #{tPaymentInfo.unitId}
...@@ -545,7 +528,7 @@ ...@@ -545,7 +528,7 @@
AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId} AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
</if> </if>
<if test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"> <if test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''">
AND a.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold} AND a.SOCIAL_HOUSEHOLD like CONCAT(#{tPaymentInfo.socialHousehold},'%')
</if> </if>
<if test="tPaymentInfo.socialSecurityNo != null and tPaymentInfo.socialSecurityNo.trim() != ''"> <if test="tPaymentInfo.socialSecurityNo != null and tPaymentInfo.socialSecurityNo.trim() != ''">
AND a.SOCIAL_SECURITY_NO like CONCAT(#{tPaymentInfo.socialSecurityNo},'%') AND a.SOCIAL_SECURITY_NO like CONCAT(#{tPaymentInfo.socialSecurityNo},'%')
...@@ -572,7 +555,7 @@ ...@@ -572,7 +555,7 @@
AND a.PROVIDENT_CREATE_MONTH = #{tPaymentInfo.providentCreateMonth} AND a.PROVIDENT_CREATE_MONTH = #{tPaymentInfo.providentCreateMonth}
</if> </if>
<if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''"> <if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
AND a.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold} AND a.PROVIDENT_HOUSEHOLD like CONCAT(#{tPaymentInfo.providentHousehold},'%')
</if> </if>
<if test="tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''"> <if test="tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''">
AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr} AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr}
...@@ -665,15 +648,6 @@ ...@@ -665,15 +648,6 @@
<if test="tPaymentInfo.unitBirthSet != null"> <if test="tPaymentInfo.unitBirthSet != null">
AND a.UNIT_BIRTH_SET = #{tPaymentInfo.unitBirthSet} AND a.UNIT_BIRTH_SET = #{tPaymentInfo.unitBirthSet}
</if> </if>
<if test="tPaymentInfo.personalPensionSet != null">
AND a.PERSONAL_PENSION_SET = #{tPaymentInfo.personalPensionSet}
</if>
<if test="tPaymentInfo.personalMedicalSet != null">
AND a.PERSONAL_MEDICAL_SET = #{tPaymentInfo.personalMedicalSet}
</if>
<if test="tPaymentInfo.personalUnemploymentSet != null">
AND a.PERSONAL_UNEMPLOYMENT_SET = #{tPaymentInfo.personalUnemploymentSet}
</if>
<if test="tPaymentInfo.unitPensionPer != null"> <if test="tPaymentInfo.unitPensionPer != null">
AND a.UNIT_PENSION_PER = #{tPaymentInfo.unitPensionPer} AND a.UNIT_PENSION_PER = #{tPaymentInfo.unitPensionPer}
</if> </if>
...@@ -807,9 +781,6 @@ ...@@ -807,9 +781,6 @@
<result property="unitUnemploymentSet" column="UNIT_UNEMPLOYMENT_SET"/> <result property="unitUnemploymentSet" column="UNIT_UNEMPLOYMENT_SET"/>
<result property="unitInjurySet" column="UNIT_INJURY_SET"/> <result property="unitInjurySet" column="UNIT_INJURY_SET"/>
<result property="unitBirthSet" column="UNIT_BIRTH_SET"/> <result property="unitBirthSet" column="UNIT_BIRTH_SET"/>
<result property="personalPensionSet" column="PERSONAL_PENSION_SET"/>
<result property="personalMedicalSet" column="PERSONAL_MEDICAL_SET"/>
<result property="personalUnemploymentSet" column="PERSONAL_UNEMPLOYMENT_SET"/>
<result property="unitPensionPer" column="UNIT_PENSION_PER"/> <result property="unitPensionPer" column="UNIT_PENSION_PER"/>
<result property="unitMedicalPer" column="UNIT_MEDICAL_PER"/> <result property="unitMedicalPer" column="UNIT_MEDICAL_PER"/>
<result property="unitUnemploymentPer" column="UNIT_UNEMPLOYMENT_PER"/> <result property="unitUnemploymentPer" column="UNIT_UNEMPLOYMENT_PER"/>
......
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