Commit d61a237c authored by fangxinjiang's avatar fangxinjiang

公积金自动化-fxj

parent 263094eb
......@@ -788,40 +788,40 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
//养老基数下限不可大于养老基数上限
if (null != infoVo.getUpPersion()
&& null != infoVo.getLowerPersion()
&& infoVo.getUpPersion().compareTo(infoVo.getLowerPersion()) < 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"养老基数下限不可大于养老基数上限,请修改后重新提交。",excel);
&& infoVo.getUpPersion().compareTo(infoVo.getLowerPersion()) <= 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"养老基数下限不可大于等于养老基数上限,请修改后重新提交。",excel);
errorMessageList.add(errorMsg);
continue;
}
//工伤基数下限不可大于工伤基数上限
if (null != infoVo.getUpInjury()
&& null != infoVo.getLowerInjury()
&& infoVo.getUpInjury().compareTo(infoVo.getLowerInjury()) < 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"工伤基数下限不可大于工伤基数上限,请修改后重新提交。",excel);
&& infoVo.getUpInjury().compareTo(infoVo.getLowerInjury()) <= 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"工伤基数下限不可大于等于工伤基数上限,请修改后重新提交。",excel);
errorMessageList.add(errorMsg);
continue;
}
//医疗基数下限不可大于医疗基数上限
if (null != infoVo.getUpMedical()
&& null != infoVo.getLowerMedical()
&& infoVo.getUpMedical().compareTo(infoVo.getLowerMedical()) < 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"医疗基数下限不可大于医疗基数上限,请修改后重新提交。",excel);
&& infoVo.getUpMedical().compareTo(infoVo.getLowerMedical()) <= 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"医疗基数下限不可大于等于医疗基数上限,请修改后重新提交。",excel);
errorMessageList.add(errorMsg);
continue;
}
//生育基数下限不可大于生育基数上限
if (null != infoVo.getUpBirth()
&& null != infoVo.getLowerBirth()
&& infoVo.getUpBirth().compareTo(infoVo.getLowerBirth()) < 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"生育基数下限不可大于生育基数上限,请修改后重新提交。",excel);
&& infoVo.getUpBirth().compareTo(infoVo.getLowerBirth()) <= 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"生育基数下限不可大于等于生育基数上限,请修改后重新提交。",excel);
errorMessageList.add(errorMsg);
continue;
}
//失业基数下限不可大于失业基数上限
if (null != infoVo.getUpUnemployment()
&& null !=infoVo.getLowerUnemployment()
&& infoVo.getUpUnemployment().compareTo(infoVo.getLowerUnemployment()) < 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"失业基数下限不可大于失业基数上限,请修改后重新提交。",excel);
&& infoVo.getUpUnemployment().compareTo(infoVo.getLowerUnemployment()) <= 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"失业基数下限不可大于等于失业基数上限,请修改后重新提交。",excel);
errorMessageList.add(errorMsg);
continue;
}
......@@ -917,8 +917,8 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
//大病基数下限不可大于失大病基数上限
if (null != infoVo.getUpBig()
&& null !=infoVo.getLowerBig()
&& infoVo.getUpBig().compareTo(infoVo.getLowerBig()) < 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"大病基数下限不可大于大病基数上限,请修改后重新提交。",excel);
&& infoVo.getUpBig().compareTo(infoVo.getLowerBig()) <= 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"大病基数下限不可大于等于大病基数上限,请修改后重新提交。",excel);
errorMessageList.add(errorMsg);
continue;
}
......@@ -1028,7 +1028,16 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
|| infoVo.getUnitUnemploymentPro().compareTo(BigDecimal.ZERO) < 0
|| infoVo.getPersonalUnemploymentPro().compareTo(BigDecimal.ZERO) < 0
|| infoVo.getPersonalMedicalPro().compareTo(BigDecimal.ZERO) < 0
|| infoVo.getPersonalPersionPro().compareTo(BigDecimal.ZERO) < 0 ){
|| infoVo.getPersonalPersionPro().compareTo(BigDecimal.ZERO) < 0
||infoVo.getUnitPersionPro().compareTo(BigDecimal.valueOf(100)) > 0
|| infoVo.getUnitInjuryPro().compareTo(BigDecimal.valueOf(100)) > 0
|| infoVo.getUnitMedicalPro().compareTo(BigDecimal.valueOf(100)) > 0
|| infoVo.getUnitBirthPro().compareTo( BigDecimal.valueOf(100)) > 0
|| infoVo.getUnitUnemploymentPro().compareTo(BigDecimal.valueOf(100)) > 0
|| infoVo.getPersonalUnemploymentPro().compareTo(BigDecimal.valueOf(100)) > 0
|| infoVo.getPersonalMedicalPro().compareTo(BigDecimal.valueOf(100)) > 0
|| infoVo.getPersonalPersionPro().compareTo(BigDecimal.valueOf(100)) > 0 ){
errorMsg = new ErrorMessage(excel.getRowIndex(),"比例需在0~100内,请修改后重新提交",excel);
errorMessageList.add(errorMsg);
continue;
......@@ -1048,7 +1057,9 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
infoVo.setPersonalProSum(BigDecimalUtils.safeAdd(infoVo.getPersonalProSum(),infoVo.getPayPersonalPro()));
//各种比例需在0~100内
if (infoVo.getPayCompanyPro().compareTo(BigDecimal.ZERO) < 0
|| infoVo.getPayPersonalPro().compareTo(BigDecimal.ZERO) < 0){
|| infoVo.getPayPersonalPro().compareTo(BigDecimal.ZERO) < 0
|| infoVo.getPayCompanyPro().compareTo(BigDecimal.valueOf(100)) > 0
|| infoVo.getPayPersonalPro().compareTo(BigDecimal.valueOf(100)) > 0){
errorMsg = new ErrorMessage(excel.getRowIndex(),"比例需在0~100内,请修改后重新提交",excel);
errorMessageList.add(errorMsg);
continue;
......@@ -1210,8 +1221,8 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
infoVo.setLowerLimit(excel.getLowerLimit());
infoVo.setUpperLimit(excel.getUpperLimit());
//基数下限不可大于基数上限
if (excel.getLowerLimit().compareTo(excel.getUpperLimit()) > 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"基数下限不可大于基数上限,请修改后重新提交。",excel);
if (excel.getLowerLimit().compareTo(excel.getUpperLimit()) >= 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(),"基数下限不可大于等于基数上限,请修改后重新提交。",excel);
errorMessageList.add(errorMsg);
continue;
}
......@@ -1321,13 +1332,13 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
if (null != splitSub && splitSub.length == 2) {
fundPro.setCompanyPro(Double.valueOf(splitSub[0]));
fundPro.setPersonalPro(Double.valueOf(splitSub[1]));
//如果单位比例大于100或小于等于0 则报错
if (fundPro.getCompanyPro() >= 100 || fundPro.getCompanyPro() <= 0) {
//如果单位比例大于100或小于0 则报错
if (fundPro.getCompanyPro() > 100 || fundPro.getCompanyPro() < 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(), "单位比例必填,只可填写“0-100”之间的数字,请修改后重新提交");
break;
}
//如果个人比例大于100或小于等于0 则报错
if (fundPro.getPersonalPro() >= 100 || fundPro.getPersonalPro() <= 0) {
if (fundPro.getPersonalPro() > 100 || fundPro.getPersonalPro() < 0) {
errorMsg = new ErrorMessage(excel.getRowIndex(), "个人比例必填,只可填写“0-100”之间的数字,请修改后重新提交");
break;
}
......
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