Commit 03df1693 authored by fangxinjiang's avatar fangxinjiang

社保公积金基数批量导入导出-fxj

parent 24b68e38
......@@ -616,12 +616,6 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
}
}
private void importSysBaseSetSocial(List<SysBaseSetSocialInsertVo> excelVOList, List<ErrorMessage> errorMessageList) {
ErrorMessage errorMsg;
if (Common.isEmpty(excelVOList)){
errorMsg = new ErrorMessage(-1,"文档数据不可为空!",null);
errorMessageList.add(errorMsg);
return;
}
// 区域数据初始化
HashMap<String, String> areaMap = new HashMap<>();
HashMap<String, Integer> areaMap2 = new HashMap<>();
......@@ -637,6 +631,8 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
}
}
}
// 个性化校验逻辑
ErrorMessage errorMsg;
//获取已有数据有效使用周期含当前时间的数据
Map<String, SysBaseSetInfo> socialSetInfoMap = this.getSysBaseSetInfoMap(CommonConstants.ZERO_STRING);
//获取已有数据有效状态的户配置
......@@ -1099,13 +1095,6 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
private void importSysBaseSetFund(List<SysBaseSetFundInsertVo> excelVOList, List<ErrorMessage> errorMessageList) {
// 个性化校验逻辑
ErrorMessage errorMsg;
if (Common.isEmpty(excelVOList)){
errorMsg = new ErrorMessage(-1,"文档数据不可为空!",null);
errorMessageList.add(errorMsg);
return;
}
// 区域数据初始化
HashMap<String, String> areaMap = new HashMap<>();
HashMap<String, Integer> areaMap2 = new HashMap<>();
......@@ -1121,7 +1110,8 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
}
}
}
// 个性化校验逻辑
ErrorMessage errorMsg;
//获取已有数据有效使用周期含当前时间的数据
Map<String, SysBaseSetInfo> fundSetInfoMap = this.getSysBaseSetInfoMap(CommonConstants.ONE_STRING);
//获取已有数据有效状态的户配置
......
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