Commit 93e7f471 authored by fangxinjiang's avatar fangxinjiang

优化-fxj

parent bff41acc
...@@ -688,6 +688,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -688,6 +688,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
continue; continue;
} }
infoVo.setDepartName(excel.getDepartName()); infoVo.setDepartName(excel.getDepartName());
infoVo.setDepartId(hold.getId());
//社保缴纳地解析 //社保缴纳地解析
areaArray = excel.getProvinceStr().split(CommonConstants.CENTER_SPLIT_LINE_STRING); areaArray = excel.getProvinceStr().split(CommonConstants.CENTER_SPLIT_LINE_STRING);
infoVo = initAddress(areaArray, areaMap2, infoVo); infoVo = initAddress(areaArray, areaMap2, infoVo);
...@@ -1159,9 +1160,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -1159,9 +1160,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
SysHouseHoldInfo hold = null; SysHouseHoldInfo hold = null;
//公积金比例 //公积金比例
List<SysPayProportion> fundProList; List<SysPayProportion> fundProList;
SysPayProportion fundPro = null;
String[] split = null; String[] split = null;
String[] splitSub = null;
String startDateTemp = null; String startDateTemp = null;
String doMonthTemp = null; String doMonthTemp = null;
// 执行数据插入操作 组装 // 执行数据插入操作 组装
...@@ -1175,7 +1174,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -1175,7 +1174,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
continue; continue;
} }
infoVo.setDepartName(excel.getDepartName()); infoVo.setDepartName(excel.getDepartName());
infoVo.setDepartId(hold.getId());
//缴纳地解析 //缴纳地解析
areaArray = excel.getProvinceStr().split(CommonConstants.CENTER_SPLIT_LINE_STRING); areaArray = excel.getProvinceStr().split(CommonConstants.CENTER_SPLIT_LINE_STRING);
infoVo = initAddress(areaArray, areaMap2, infoVo); infoVo = initAddress(areaArray, areaMap2, infoVo);
......
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