Commit ae5c5731 authored by fangxinjiang's avatar fangxinjiang

公积金自动化-fxj

parent 38948622
......@@ -948,7 +948,9 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
}
}
// 判断数据对象是否都在页面传的对象里,有不在的数据,则返回true 目的是判断是否更新了
socialFlag = checkSocialRuleRelForNotIn(socialRuleRelsOld,socialRuleRels);
if (!socialFlag){
socialFlag = checkSocialRuleRelForNotIn(socialRuleRelsOld,socialRuleRels);
}
}
......@@ -1006,7 +1008,9 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
}
}
// 判断数据对象是否都在页面传的对象里,有不在的数据,则返回true 目的是判断是否更新了
fundFlag = checkFundRuleRelForNotIn(fundRuleRelsOld,fundRuleRels);
if (!fundFlag){
fundFlag = checkFundRuleRelForNotIn(fundRuleRelsOld,fundRuleRels);
}
}
// 更新主表
......@@ -1675,7 +1679,7 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
rel.setTown(setInfo.getTown());
if (CommonConstants.THREE_STRING.equals(rel.getPaymentType())){
if (rel.getFundBase().compareTo(setInfo.getLowerLimit()) < 0) {
return R.failed("公积金基数需≥当前户("+rel.getConfigName()+")的最低基数:"+setInfo.getLowerLimit()+"!");
return R.failed("公积金基数需≥当前户("+setInfo.getDepartName()+")的最低基数:"+setInfo.getLowerLimit()+"!");
}
}
......
......@@ -1012,7 +1012,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
**/
@Override
public Boolean getFundPreStatus(String id) {
//获取社保已购买信息
//获取公积金已购买信息
TDispatchInfoPre preExit = baseMapper.selectById(id);
if (Common.isNotNull(preExit)
&& (CommonConstants.THREE_STRING.equals(preExit.getProcessStatus())
......
......@@ -3837,7 +3837,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
//公积金状态处理
if (Common.isNotNull(dis.getFundId())) {
if (Common.isEmpty(remarkTemp)) {
if (!Common.isEmpty(remarkTemp)) {
remarkTemp += "、公积金";
} else {
remarkTemp += "公积金";
......
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