Commit 2520b185 authored by fangxinjiang's avatar fangxinjiang

预派单调整

parent 856b927f
...@@ -653,7 +653,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -653,7 +653,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
HashMap<String, List<SysBaseSetInfo>> baseFundSetMap = new HashMap<>(); HashMap<String, List<SysBaseSetInfo>> baseFundSetMap = new HashMap<>();
HashMap<String, TPreDispatchInfo> baseSocialTimeMap = new HashMap<>(); HashMap<String, TPreDispatchInfo> baseSocialTimeMap = new HashMap<>();
HashMap<String, TPreDispatchInfo> baseFundTimeMap = new HashMap<>(); HashMap<String, TPreDispatchInfo> baseFundTimeMap = new HashMap<>();
initSocialAndFundBaseSet(listInfo, baseSocialSetMap, baseFundSetMap, baseSocialTimeMap, baseFundTimeMap); initSocialAndFundBaseSet(listInfo, baseSocialSetMap, baseFundSetMap, baseSocialTimeMap, baseFundTimeMap, null);
// 查询当月对应身份证是否已经派增或派减了 后面做判重处理 // 查询当月对应身份证是否已经派增或派减了 后面做判重处理
HashMap<String, TPreDispatchInfo> existsMap = new HashMap<>(); HashMap<String, TPreDispatchInfo> existsMap = new HashMap<>();
initExistsMapByIdCards(listInfo, existsMap, CommonConstants.ZERO_STRING); initExistsMapByIdCards(listInfo, existsMap, CommonConstants.ZERO_STRING);
...@@ -807,8 +807,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -807,8 +807,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
HashMap<String, TPreDispatchInfo> baseFundTimeMap = new HashMap<>(); HashMap<String, TPreDispatchInfo> baseFundTimeMap = new HashMap<>();
HashMap<String,TPreDispatchInfo> existsMap = new HashMap<>(); HashMap<String,TPreDispatchInfo> existsMap = new HashMap<>();
HashMap<String,TPreDispatchInfo> repeatMap = new HashMap<>(); HashMap<String,TPreDispatchInfo> repeatMap = new HashMap<>();
initSocialAndFundBaseSet(listInfo, baseSocialSetMap, baseFundSetMap, baseSocialTimeMap, baseFundTimeMap);
initExistsMapByIds(listInfo,existsMap,repeatMap); initExistsMapByIds(listInfo,existsMap,repeatMap);
initSocialAndFundBaseSet(listInfo, baseSocialSetMap, baseFundSetMap, baseSocialTimeMap, baseFundTimeMap,existsMap);
// 获取所有地市的最迟派单日限制 // 获取所有地市的最迟派单日限制
HashMap<String,Integer> dayConfMap = new HashMap<>(); HashMap<String,Integer> dayConfMap = new HashMap<>();
initDayConfMap(dayConfMap); initDayConfMap(dayConfMap);
...@@ -1056,6 +1056,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -1056,6 +1056,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
errorList.add(new ErrorMessage(i, CommonConstants.DATA_CAN_NOT_EMPTY)); errorList.add(new ErrorMessage(i, CommonConstants.DATA_CAN_NOT_EMPTY));
return true; return true;
} }
info.setCompany(temp.getCompany());
info.setType(temp.getType()); info.setType(temp.getType());
if (null != repeat && !repeat.getId().equals(info.getId())){ if (null != repeat && !repeat.getId().equals(info.getId())){
errorList.add(new ErrorMessage(i, "已存在身份证对应缴费地的数据!")); errorList.add(new ErrorMessage(i, "已存在身份证对应缴费地的数据!"));
...@@ -1866,7 +1867,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -1866,7 +1867,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
!info.getPensionStart().equals(temp.getPensionStart())); !info.getPensionStart().equals(temp.getPensionStart()));
} }
if (flag) { if (flag) {
dateTime = DateUtil.stringToDate(info.getPensionStart()+"01", DateUtil.ISO_DATE_FORMAT); dateTime = DateUtil.stringToDate(DateUtil.getYearAndMonth(info.getPensionStart(),CommonConstants.ONE_INT)+"01", DateUtil.ISO_DATE_FORMAT);
if (null != dateTime) { if (null != dateTime) {
socialBases = baseSocialSetMap.get(info.getCompany()); socialBases = baseSocialSetMap.get(info.getCompany());
if (Common.isNotNull(socialBases)){ if (Common.isNotNull(socialBases)){
...@@ -1917,7 +1918,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -1917,7 +1918,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
!info.getFundStart().equals(temp.getFundStart())); !info.getFundStart().equals(temp.getFundStart()));
} }
if (flag) { if (flag) {
dateTime = DateUtil.stringToDate(info.getFundStart()+"01", DateUtil.ISO_DATE_FORMAT); dateTime = DateUtil.stringToDate(DateUtil.getYearAndMonth(info.getFundStart(),CommonConstants.ONE_INT)+"01", DateUtil.ISO_DATE_FORMAT);
if (null != dateTime) { if (null != dateTime) {
baseSetInfos = baseFundSetMap.get(info.getCompany()); baseSetInfos = baseFundSetMap.get(info.getCompany());
if (Common.isNotNull(baseSetInfos)){ if (Common.isNotNull(baseSetInfos)){
...@@ -2029,6 +2030,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -2029,6 +2030,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
* @param baseFundSetMap * @param baseFundSetMap
* @param baseSocialTimeMap * @param baseSocialTimeMap
* @param baseFundTimeMap * @param baseFundTimeMap
* @param existsMap
* @return * @return
* @Author huyc * @Author huyc
* @Date 2022-07-18 * @Date 2022-07-18
...@@ -2037,12 +2039,20 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -2037,12 +2039,20 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
Map<String, List<SysBaseSetInfo>> baseSocialSetMap, Map<String, List<SysBaseSetInfo>> baseSocialSetMap,
Map<String, List<SysBaseSetInfo>> baseFundSetMap, Map<String, List<SysBaseSetInfo>> baseFundSetMap,
Map<String, TPreDispatchInfo> baseSocialTimeMap, Map<String, TPreDispatchInfo> baseSocialTimeMap,
Map<String, TPreDispatchInfo> baseFundTimeMap) { Map<String, TPreDispatchInfo> baseFundTimeMap, HashMap<String, TPreDispatchInfo> existsMap) {
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
Map<String, String> houseMap = new HashMap<>(); Map<String, String> houseMap = new HashMap<>();
if (Common.isNotNull(listInfo)) { if (Common.isNotNull(listInfo)) {
TPreDispatchInfo temp;
for (TPreDispatchInfo info : listInfo) { for (TPreDispatchInfo info : listInfo) {
houseMap.put(info.getCompany(),info.getCompany()); if (Common.isNotNull(existsMap)){
temp = existsMap.get(info.getId());
if (Common.isNotNull(temp)){
houseMap.put(info.getCompany(),info.getCompany());
}
}else {
houseMap.put(info.getCompany(),info.getCompany());
}
if (Common.isNotNull(info.getPensionStart())) { if (Common.isNotNull(info.getPensionStart())) {
baseSocialTimeMap.put(info.getPensionStart(), info); baseSocialTimeMap.put(info.getPensionStart(), info);
} }
......
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