Commit 9b89ba88 authored by fangxinjiang's avatar fangxinjiang

公积金多比例 fxj

parent 7d44fe68
......@@ -597,6 +597,13 @@ public class TPaymentInfo extends BaseEntity {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人公积金基数")
private BigDecimal personalProidentSet;
/**
* 个人公积金比例
*/
@ExcelAttribute(name = "个人公积金比例")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人公积金比例")
private BigDecimal personalProvidentPercent;
/**
* 个人公积金费用
*/
......
......@@ -475,7 +475,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
private BigDecimal providentCardinal;
/**
* 公积金比例
* 单位公积金比例(原‘公积金比例’)
*/
@ExcelAttribute(name = "公积金比例" )
@Schema(description = "公积金比例" )
......@@ -484,6 +484,25 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
private BigDecimal providentPer;
/**
* 个人公积金比例
*/
@ExcelAttribute(name = "个人公积金比例" )
@Schema(description = "个人公积金比例" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("个人公积金比例" )
private BigDecimal personalProvidentPer;
/**
* 单位个人公积金比例是否相同 0 是 1 否
*/
@ExcelAttribute(name = "单位个人公积金比例是否相同" ,isNotEmpty = true,isDataId = true,readConverterExp = "0=是,1=否")
@Schema(description = "单位个人公积金比例是否相同" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位个人公积金比例是否相同" )
private BigDecimal perFlag ;
/**
* 委托备注
*/
......
......@@ -1517,7 +1517,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
fund.setTrustRemark(excel.getTrustRemark());
fund.setUnitProvidengCardinal(excel.getProvidentCardinal());
fund.setPersonalProvidentCardinal(excel.getProvidentCardinal());
fund.setPersonalProvidentPer(excel.getProvidentPer());
fund.setUnitProvidentPer(excel.getProvidentPer());
fund.setProvidentStart(excel.getProvidentStart());
if (Common.isNotNull(fundSet)){
......@@ -1551,6 +1550,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
fund.setPersonalProvidentFee(Common.formatMoneyForFund(BigDecimalUtils.safeMultiply(fund.getPersonalProvidentCardinal(), fund.getPersonalProvidentPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())),Integer.valueOf(fund.getFundPayPoint())));
}
}
// 校验公积金比例后会同步excel的个人公积金比例,顺序不要调整了
fund.setPersonalProvidentPer(excel.getPersonalProvidentPer());
funds.put(excel.getEmpIdcard(),fund);
}
return false;
......@@ -1561,9 +1562,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @Deprecated 对比公积金比例,对应上true false
**/
private boolean checkFundPer(List<SysPayProportion> pays,TDispatchImportVo excel){
if (Common.isNotNull(excel.getProvidentPer()) && Common.isNotNull(pays)){
//单位个人公积金是否一致:perFlag 0是 1 否 2024-12-05 v1.7.3
if (CommonConstants.ZERO_STRING.equals(excel.getPerFlag())){
excel.setPersonalProvidentPer(excel.getProvidentPer());
}
if (Common.isNotNull(excel.getProvidentPer())
&& Common.isNotNull(excel.getPersonalProvidentPer())
&& Common.isNotNull(pays)){
for (SysPayProportion per: pays){
if (per.getCompanyPro().doubleValue()==excel.getProvidentPer().doubleValue()){
if (per.getCompanyPro().doubleValue()==excel.getProvidentPer().doubleValue()
&& per.getPersonalPro().doubleValue()==excel.getPersonalProvidentPer().doubleValue()){
return true;
}
}
......@@ -2528,7 +2536,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(excel.getProvidentHousehold()) && (
Common.isEmpty(excel.getProvidentCardinal())
|| Common.isEmpty(excel.getProvidentStart())
|| Common.isEmpty(excel.getPerFlag())
|| Common.isEmpty(excel.getProvidentPer())
|| (Common.isEmpty(excel.getPersonalProvidentPer()) && CommonConstants.ONE_STRING.equals(excel.getPerFlag()))
)) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_FUND_NOT_EMPTY)));
return true;
......
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