社保档位与保险类型字典表合并

yijiusmile

2021-04-07 63b7d86ec70171ddb2c1cbe0cdddea57c4313889

社保档位与保险类型字典表合并

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/constant/DicCode.java

@@ -86,5 +86,5 @@
    /**
     * 社保档位
     */
    public final static String INSURANCE_GAERS = "insuranceGaers";
    public final static String INSURANCE_GAERS = INSURANCETYPE;
}

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpInsuranceServiceImpl.java

@@ -215,7 +215,7 @@
            }
            empInsurance.setProposer(list.get(6).toString());
            //社保档位
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"insuranceGaers")&&StrUtil.equals(j.getDicItemName(),list.get(7).toString())).findFirst().orElse(null);
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"INSURANCETYPE")&&StrUtil.equals(j.getDicItemName(),list.get(7).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                empInsurance.setInsuranceGaers(dicItem.getDicItemCode());
            }

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/ExportPdfServiceImpl.java

@@ -105,7 +105,7 @@
            }
            //社保档位
            Map<String,String> insuranceGaers = new HashMap<>();
            for (DicItem m:   empAccessoryMapper.getDictType("insuranceGaers")) {
            for (DicItem m:   empAccessoryMapper.getDictType("INSURANCETYPE")) {
                insuranceGaers.put(m.getDicItemCode(),m.getDicItemName());
            }
            //社保是否已经报告