Skip to content

Y
yifu-mvp
Commit 44ee2df9 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

派单调整

parent 99722b49
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 49 deletions
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/DispatchConstants.java
View file @ 44ee2df9
......@@ -46,7 +46,7 @@ public class DispatchConstants {
/**
* 社保派单
* '缴纳类型（0最低缴纳、1自定义、2最高缴纳） PAYMENT_TYPE
* '缴纳类型（0最低、1自定义、2最高） PAYMENT_TYPE
*/
enum PaymentType {
LATEST("0", "最低"),
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundHistory.java
View file @ 44ee2df9
......@@ -298,11 +298,11 @@ public class TSocialFundHistory extends BaseEntity {
@ExcelProperty("个人公积金金额" )
private BigDecimal personalFundMoney;
/**
* 缴纳类型（0最低缴纳、1自定义、2最高缴纳）
* 缴纳类型（0最低、1自定义、2最高）
*/
@ExcelAttribute(name = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
@ExcelProperty("缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
@ExcelAttribute(name = "缴纳类型（0最低、1自定义、2最高）" )
@Schema(description = "缴纳类型（0最低、1自定义、2最高）" )
@ExcelProperty("缴纳类型（0最低、1自定义、2最高）" )
private Integer paymentType;
/**
* 是否是社保：0否1是
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java
View file @ 44ee2df9
......@@ -608,12 +608,12 @@ public class TSocialFundInfo extends BaseEntity {
@ExcelProperty("委托备注" )
private String trustRemark;
/**
* 缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）
* 缴纳类型（0最低、1自定义缴纳、2最高）
*/
@Length(max = 1, message = "缴纳类型（0最低缴纳、1自定义、2最高缴纳） 不能超过1个字符" )
@ExcelAttribute(name = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）", maxLength = 1)
@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
@ExcelProperty("缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
@Length(max = 1, message = "缴纳类型（0最低、1自定义、2最高） 不能超过1个字符" )
@ExcelAttribute(name = "缴纳类型（0最低、1自定义、2最高）", maxLength = 1)
@Schema(description = "缴纳类型（0最低、1自定义、2最高）" )
@ExcelProperty("缴纳类型（0最低、1自定义、2最高）" )
private String paymentType;
/**
* 基数上限（社保或公积金）
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
View file @ 44ee2df9
......@@ -634,12 +634,12 @@ public class TSocialInfo extends BaseEntity {
@ExcelProperty("电信编号" )
private String telecomNumber;
/**
* 缴纳类型（0最低缴纳、1自定义、2最高缴纳）
* 缴纳类型（0最低、1自定义、2最高）
*/
@Length(max = 1, message = "缴纳类型（0最低缴纳、1自定义、2最高缴纳） 不能超过1个字符" )
@ExcelAttribute(name = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）", maxLength = 1)
@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
@ExcelProperty("缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
@Length(max = 1, message = "缴纳类型（0最低、1自定义、2最高） 不能超过1个字符" )
@ExcelAttribute(name = "缴纳类型（0最低、1自定义、2最高）", maxLength = 1)
@Schema(description = "缴纳类型（0最低、1自定义、2最高）" )
@ExcelProperty("缴纳类型（0最低、1自定义、2最高）" )
private String paymentType;
/**
* 备案基数
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
View file @ 44ee2df9
......@@ -197,10 +197,10 @@ public class SocialHandleExportVo implements Serializable {
private String recordBase;
/**
* 缴纳类型（0最低缴纳、1自定义、2最高缴纳）
* 缴纳类型（0最低、1自定义、2最高）
*/
@ExcelAttribute(name = "缴纳类型",isDataId = true,readConverterExp = "0=最低缴纳,1=自定义,2=最高缴纳",needExport = true)
@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）")
@ExcelAttribute(name = "缴纳类型",isDataId = true,readConverterExp = "0=最低,1=自定义,2=最高",needExport = true)
@Schema(description = "缴纳类型（0最低、1自定义、2最高）")
@ExcelProperty("缴纳类型" )
private String paymentType;
/**
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
View file @ 44ee2df9
......@@ -306,11 +306,11 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
@ExcelProperty("大病起缴日期" )
private Date bigailmentStart;
/**
* 缴纳类型（0最低缴纳、1自定义、2最高缴纳）
* 缴纳类型（0最低、1自定义、2最高）
*/
@Length(max = 1, message = "缴纳类型 不能超过1 个字符" )
@ExcelAttribute(name = "缴纳类型", isDataId = true, readConverterExp = "0=最低缴纳,1=自定义,2=最高缴纳")
@Schema(description = "缴纳类型:（0最低缴纳、1自定义、2最高缴纳）" )
@ExcelAttribute(name = "缴纳类型", isDataId = true, readConverterExp = "0=最低,1=自定义,2=最高")
@Schema(description = "缴纳类型:（0最低、1自定义、2最高）" )
@ExcelProperty("缴纳类型" )
private String paymentType;
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundHistoryVo.java
View file @ 44ee2df9
......@@ -50,8 +50,8 @@ public class TSocialFundHistoryVo extends RowIndex implements Serializable {
@ExcelProperty("身份证号")
private String empIdcard;
@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低缴纳,1=自定义缴纳,2=最高缴纳")
@Schema(description = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）")
@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低,1=自定义缴纳,2=最高")
@Schema(description = "缴纳类型（0最低、1自定义缴纳、2最高）")
@ExcelProperty("缴纳类型")
private String paymentType;
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundInfoExportVo.java
View file @ 44ee2df9
......@@ -303,8 +303,8 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
@ExcelProperty("大病起缴日期")
private Date bigailmentStart;
@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低缴纳,1=自定义,2=最高缴纳")
@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）")
@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低,1=自定义,2=最高")
@Schema(description = "缴纳类型（0最低、1自定义、2最高）")
@ExcelProperty("缴纳类型")
private String paymentType;
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundInfoVo.java
View file @ 44ee2df9
......@@ -301,8 +301,8 @@ public class TSocialFundInfoVo extends RowIndex implements Serializable {
@ExcelProperty("大病起缴日期")
private Date bigailmentStart;
@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低缴纳,1=自定义,2=最高缴纳")
@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）")
@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低,1=自定义,2=最高")
@Schema(description = "缴纳类型（0最低、1自定义、2最高）")
@ExcelProperty("缴纳类型")
private String paymentType;
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialInfoVo.java
View file @ 44ee2df9
......@@ -620,12 +620,12 @@ public class TSocialInfoVo extends RowIndex implements Serializable {
@ExcelProperty("电信编号" )
private String telecomNumber;
/**
* 缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）
* 缴纳类型（0最低、1自定义缴纳、2最高）
*/
@Length(max = 1, message = "缴纳类型（0最低缴纳、1自定义、2最高缴纳） 不能超过1 个字符" )
@ExcelAttribute(name = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）", maxLength = 1)
@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
@ExcelProperty("缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
@Length(max = 1, message = "缴纳类型（0最低、1自定义、2最高） 不能超过1 个字符" )
@ExcelAttribute(name = "缴纳类型（0最低、1自定义、2最高）", maxLength = 1)
@Schema(description = "缴纳类型（0最低、1自定义、2最高）" )
@ExcelProperty("缴纳类型（0最低、1自定义、2最高）" )
private String paymentType;
/**
* 备案基数
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 44ee2df9
......@@ -1232,6 +1232,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
}
social.setUnitPersionMoney(BigDecimalUtils.safeMultiply(social.getUnitPensionCardinal(), social.getUnitPensionPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
social.setUnitMedicalMoney(BigDecimalUtils.safeMultiply(social.getUnitMedicalCardinal(), social.getUnitMedicalPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
social.setUnitBirthMoney(BigDecimalUtils.safeMultiply(social.getUnitBirthCardinal(), social.getUnitBirthPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
......@@ -1297,7 +1298,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setUnitPersionMoney(null);
social.setUnitPensionPer(null);
social.setUnitPensionCardinal(null);
social.setInsurancePension(null);
}
if (Common.isEmpty(social.getMedicalStart())){
social.setMedicalHandle(null);
......@@ -1307,30 +1307,33 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setUnitMedicalMoney(null);
social.setUnitMedicalPer(null);
social.setUnitMedicalCardinal(null);
social.setInsuranceMedical(null);
}
if (Common.isEmpty(social.getBirthStart())){
social.setBirthHandle(null);
social.setUnitBirthMoney(null);
social.setUnitBirthPer(null);
social.setUnitBirthCardinal(null);
social.setInsuranceBirth(null);
}
if (Common.isEmpty(social.getUnemployStart())){
social.setUnemployHandle(null);
social.setUnitUnemploymentCardinal(null);
social.setUnitUnemploymentPer(null);
social.setUnitUnemploymentCardinal(null);
social.setInsuranceUnemployment(null);
}
if (Common.isEmpty(social.getWorkInjuryStart())){
social.setWorkInjuryHandle(null);
social.setUnitInjuryMoney(null);
social.setUnitWorkUnjuryPer(null);
social.setUnitWorkInjuryCardinal(null);
social.setInsuranceInjury(null);
}
if (Common.isEmpty(social.getBigailmentStart())){
if (Common.isEmpty(social.getBigailmentStart())
|| (Common.isEmpty(social.getPensionStart())
&& Common.isEmpty(social.getMedicalStart())
&& Common.isEmpty(social.getBirthStart())
&& Common.isEmpty(social.getUnemployStart())
&& Common.isEmpty(social.getBigailmentStart())
&& Common.isNotNull(social.getWorkInjuryStart())
)){
social.setBigailmentHandle(null);
social.setPersonalBigailmentCardinal(null);
social.setPersonalBigailmentPer(null);
......@@ -1338,7 +1341,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social.setUnitBigailmentMoney(null);
social.setUnitBigailmentPer(null);
social.setUnitBigailmentCardinal(null);
social.setInsuranceBigailment(null);
}
}
......@@ -1897,12 +1899,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(excel.getRecordBase()) && Common.isNotNull(excel.getSocialHousehold())){
// 自定义 只要有一个不相当同的 日期或基数 就要提示
if (CommonConstants.ONE_STRING.equals(excel.getPaymentType()) && Common.isEmpty(excel.getTrustRemark())
&& (excel.getPensionCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT
|| excel.getMedicalCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT
|| excel.getUnemploymentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT
|| excel.getWorkInjuryCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT
|| excel.getBirthCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT
|| excel.getBigailmentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT
&& ((Common.isNotNull(excel.getPensionCardinal())
&& excel.getPensionCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| (Common.isNotNull(excel.getMedicalCardinal())
&& excel.getMedicalCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| (Common.isNotNull(excel.getUnemploymentCardinal())
&& excel.getUnemploymentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| (Common.isNotNull(excel.getWorkInjuryCardinal())
&& excel.getWorkInjuryCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| (Common.isNotNull(excel.getBirthCardinal())
&& excel.getBirthCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
|| (Common.isNotNull(excel.getBigailmentCardinal())
&& excel.getBigailmentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR)));
return true;
......@@ -2140,7 +2148,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_FAILED));
continue;
}
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN));
}
}
......@@ -2738,13 +2745,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (CommonConstants.ZERO_INT == flag) {
temp.setLength(CommonConstants.ZERO_INT);
temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
temp.append(socialTypeRemark.toString());
temp.append(socialTypeRemark);
temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS);
initAuditInfo(auditInfo, ( temp + handleRemark), handleStatus, user, temp.toString());
} else {
temp.setLength(CommonConstants.ZERO_INT);
temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
temp.append(socialTypeRemark.toString());
temp.append(socialTypeRemark);
temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
initAuditInfo(auditInfo, ( temp + handleRemark), handleStatus, user, temp.toString());
}
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @ 44ee2df9
......@@ -1082,7 +1082,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
* @param library 预估库
* @param socialInfo 社保
* @param sysBaseSetInfo 基数配置
* @param paymentType 0最低缴纳、1自定义、2最高缴纳
* @param paymentType 0最低、1自定义、2最高
* @Description: 塞大病金额
* @Author: hgw
* @Date: 2020/11/25 15:51
......
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