修改bug

yz_08

2021-03-17 19b2927073b5a2b14ca07939a6bfc0a0a34fe98c

修改bug

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java

@@ -223,7 +223,7 @@
                empPhysicalExamService.importEmpPhysicalExam(listObject.get(2),returnList,dicItems);
                empContractInfoService.importEmpContractInfo(listObject.get(3),returnList,dicItems);
                empDimissionAttendService.importEmpDimissionAttend(listObject.get(4),returnList);
                empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList);
                empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList,dicItems);
                empResignService.importEmpResign(listObject.get(6),returnList);
                empUnemploymentService.importEmpUnemployment(listObject.get(7),returnList);
                empInsuranceService.importEmpInsurance(listObject.get(8),returnList,dicItems);

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java

@@ -86,6 +86,7 @@
    private String insuranceGaers = "";
    
    @ExcelField(value = "社保档位")
    @TableField(exist = false)
    private String insuranceGaersName = "";
    
    @FieldInfo(name = "reportStatus", type = "bit", explain = "是否已报告1-未报告 2-已报告")

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

@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.service;

import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;

import cc.mrbird.febs.common.core.entity.QueryRequest;
@@ -78,5 +79,5 @@
     */
    boolean momentToNormal(String ids);

    void importEmpLeaveInfo(List<List<Object>> listObject,List<String>  returnList);
    void importEmpLeaveInfo(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems );
}

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

@@ -214,21 +214,27 @@
                empInsurance.setApplayDate(DateUtil.parseDate(list.get(5).toString()));
            }
            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);
            if (null!=dicItem){
                empInsurance.setInsuranceGaers(dicItem.getDicItemCode());
            }

            if (StringUtils.isNotBlank(list.get(8).toString())) {
                empInsurance.setReportStatus("未报告".equals(list.get(8).toString()) ? 0 : 1);

            dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"reportStatus")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                empInsurance.setReportStatus(Integer.valueOf(dicItem.getDicItemCode()));
            }
            if (StringUtils.isNotBlank(list.get(8).toString())) {
                empInsurance.setApplayStatus("未申请".equals(list.get(8).toString()) ? 0 : 1);

              dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"applayStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                empInsurance.setApplayStatus(Integer.valueOf(dicItem.getDicItemCode()));
            }
            empInsurance.setAuditor(list.get(9).toString());
            empInsurance.setRemark(list.get(10).toString());

            empInsurance.setAuditor(list.get(10).toString());
            empInsurance.setRemark(list.get(11).toString());
            empInsurance.setEmpStatus(empBaseInfo.getEmpStatus());
            empInsurance.setCreator(FebsUtil.getUserId());
            this.save(empInsurance);
        }
    }

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

@@ -155,7 +155,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void importEmpLeaveInfo(List<List<Object>> listObject,List<String>  returnList) {
    public void importEmpLeaveInfo(List<List<Object>> listObject,List<String>  returnList,List<DicItem> dicItems ) {
        for (List<Object> list : listObject) {
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
@@ -193,7 +193,12 @@
            if (StringUtils.isNotBlank(list.get(7).toString())) {
                leaveInfo.setLeaveDay(new BigDecimal(list.get(7).toString()));
            }
            leaveInfo.setLeaveType(list.get(8).toString().equals("病假")?"1":"2");
            //请假类型
            DicItem  dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"leavetype")&&StrUtil.equals(j.getDicItemName(),list.get(8).toString())).findFirst().orElse(null);
            if (null!=dicItem){
                leaveInfo.setLeaveType(dicItem.getDicItemCode());
            }

            if (StringUtils.isNotBlank(list.get(9).toString())) {
                leaveInfo.setReturnDate(DateUtil.parseDate(list.get(9).toString()));
            }