Commit 2308996b authored by fangxinjiang's avatar fangxinjiang

公积金自动化配置-fxj

parent 94a83647
......@@ -1627,6 +1627,21 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
if (Common.isNotNull(errorMessage)){
return R.failed(errorMessage.getMessage());
}
//初始化最高最低基数及省市县
if (!Common.isNotNull(rel.getConfigHouseId())){
return R.failed("公积金户不可为空");
}
R<SysBaseSetInfoVo> resR = socialDaprUtils.getSocialHouseBaseSet(rel.getConfigHouseId());
if (Common.isNotNull(resR) && resR.getData() != null) {
SysBaseSetInfoVo setInfo = resR.getData();
rel.setLowerLimit(setInfo.getLowerLimit());
rel.setUpperLimit(setInfo.getUpperLimit());
rel.setProvince(setInfo.getProvince());
rel.setCity(setInfo.getCity());
rel.setTown(setInfo.getTown());
}else {
return R.failed("获取公积金配置信息失败!");
}
}
// 校验fundRuleRels 配置名称是否重复
Set<String> names = fundRuleRels.stream().map(TAutoFundRuleRel::getConfigName).collect(Collectors.toSet());
......
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